Skip to content

Commit

Permalink
fix: iOS module
Browse files Browse the repository at this point in the history
- project.pbxproj aligned to Xcode 12.4
- amend podspec
- remove not necessary files
- improve package.json syntax
- add peerDependency on react-native 0.60.0
  • Loading branch information
fabriziomoscon committed Apr 6, 2021
1 parent e465f4d commit 6d397c1
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 40 deletions.
24 changes: 14 additions & 10 deletions RNTwilioVoice.podspec
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
require 'json'

spec = JSON.load(File.read(File.expand_path("./package.json", __dir__)))
package = JSON.load(File.read(File.expand_path("./package.json", __dir__)))

Pod::Spec.new do |s|
s.name = "RNTwilioVoice"
s.version = spec['version']
s.summary = spec['description']
s.authors = spec['author']['name']
s.homepage = spec['homepage']
s.license = spec['license']
s.platform = :ios, "10.0"
s.version = package['version']
s.summary = package['description']
s.author = package['contributors'][0]['name']
s.homepage = package['homepage']
s.license = package['license']
s.platform = :ios, "11.0"
s.requires_arc = true

s.source_files = [ "ios/RNTwilioVoice/*.h", "ios/RNTwilioVoice/*.m"]
s.source = {:path => "./RNTwilioVoice"}
s.source_files = 'ios/RNTwilioVoice/*.{h,m}'
s.source = { git: 'https://github.com/hoxfon/react-native-twilio-programmable-voice', tag: s.version }

s.dependency 'React'
s.dependency 'React-Core'
s.dependency 'TwilioVoice', '~> 5.2.0'
s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/TwilioVoice/Build/iOS' }
s.frameworks = 'TwilioVoice'
s.preserve_paths = 'LICENSE', 'README.md', 'package.json', 'index.js'

end
26 changes: 23 additions & 3 deletions ios/RNTwilioVoice.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
38F71DED1E9C333E0067E86F /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0830;
LastUpgradeCheck = 1240;
ORGANIZATIONNAME = Erva;
TargetAttributes = {
38F71DF41E9C333F0067E86F = {
Expand All @@ -96,11 +96,11 @@
};
buildConfigurationList = 38F71DF01E9C333E0067E86F /* Build configuration list for PBXProject "RNTwilioVoice" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
mainGroup = 38F71DEC1E9C333E0067E86F;
productRefGroup = 38F71DF61E9C333F0067E86F /* Products */;
Expand Down Expand Up @@ -129,21 +129,31 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -185,21 +195,31 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions ios/RNTwilioVoice/RNTwilioVoice.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
//
// TwilioVoice.h
// TwilioVoice
//

#import <React/RCTBridgeModule.h>
#import <React/RCTEventEmitter.h>

Expand Down
4 changes: 0 additions & 4 deletions ios/RNTwilioVoice/RNTwilioVoice.m
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
//
// TwilioVoice.m
//

#import "RNTwilioVoice.h"
#import <React/RCTLog.h>

Expand Down
13 changes: 10 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"devDependencies": {},
"nativePackage": true,
"homepage": "https://github.com/hoxfon/react-native-twilio-programmable-voice",
"keywords": [
"twilio",
Expand All @@ -28,8 +28,15 @@
"type": "git",
"url": "git+ssh://[email protected]:hoxfon/react-native-twilio-programmable-voice.git"
},
"author": {
"name": "Fabrizio Moscon"
"contributors": [
{
"name": "Fabrizio Moscon"
}
],
"dependencies": {},
"devDependencies": {},
"peerDependencies": {
"react-native": ">=0.60.0"
},
"license": "MIT"
}

0 comments on commit 6d397c1

Please sign in to comment.