Skip to content

Commit 6d397c1

Browse files
fix: iOS module
- 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
1 parent e465f4d commit 6d397c1

File tree

7 files changed

+47
-40
lines changed

7 files changed

+47
-40
lines changed

RNTwilioVoice.podspec

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
require 'json'
22

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

55
Pod::Spec.new do |s|
66
s.name = "RNTwilioVoice"
7-
s.version = spec['version']
8-
s.summary = spec['description']
9-
s.authors = spec['author']['name']
10-
s.homepage = spec['homepage']
11-
s.license = spec['license']
12-
s.platform = :ios, "10.0"
7+
s.version = package['version']
8+
s.summary = package['description']
9+
s.author = package['contributors'][0]['name']
10+
s.homepage = package['homepage']
11+
s.license = package['license']
12+
s.platform = :ios, "11.0"
13+
s.requires_arc = true
1314

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

17-
s.dependency 'React'
18+
s.dependency 'React-Core'
19+
s.dependency 'TwilioVoice', '~> 5.2.0'
1820
s.xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/TwilioVoice/Build/iOS' }
1921
s.frameworks = 'TwilioVoice'
22+
s.preserve_paths = 'LICENSE', 'README.md', 'package.json', 'index.js'
23+
2024
end

ios/RNTwilioVoice.xcodeproj/project.pbxproj

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
38F71DED1E9C333E0067E86F /* Project object */ = {
8686
isa = PBXProject;
8787
attributes = {
88-
LastUpgradeCheck = 0830;
88+
LastUpgradeCheck = 1240;
8989
ORGANIZATIONNAME = Erva;
9090
TargetAttributes = {
9191
38F71DF41E9C333F0067E86F = {
@@ -96,11 +96,11 @@
9696
};
9797
buildConfigurationList = 38F71DF01E9C333E0067E86F /* Build configuration list for PBXProject "RNTwilioVoice" */;
9898
compatibilityVersion = "Xcode 3.2";
99-
developmentRegion = English;
99+
developmentRegion = en;
100100
hasScannedForEncodings = 0;
101101
knownRegions = (
102-
English,
103102
en,
103+
Base,
104104
);
105105
mainGroup = 38F71DEC1E9C333E0067E86F;
106106
productRefGroup = 38F71DF61E9C333F0067E86F /* Products */;
@@ -129,21 +129,31 @@
129129
buildSettings = {
130130
ALWAYS_SEARCH_USER_PATHS = NO;
131131
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
132+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
132133
CLANG_ANALYZER_NONNULL = YES;
133134
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
134135
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
135136
CLANG_CXX_LIBRARY = "libc++";
136137
CLANG_ENABLE_MODULES = YES;
137138
CLANG_ENABLE_OBJC_ARC = YES;
139+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
138140
CLANG_WARN_BOOL_CONVERSION = YES;
141+
CLANG_WARN_COMMA = YES;
139142
CLANG_WARN_CONSTANT_CONVERSION = YES;
143+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
140144
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
141145
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
142146
CLANG_WARN_EMPTY_BODY = YES;
143147
CLANG_WARN_ENUM_CONVERSION = YES;
144148
CLANG_WARN_INFINITE_RECURSION = YES;
145149
CLANG_WARN_INT_CONVERSION = YES;
150+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
151+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
152+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
146153
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
154+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
155+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
156+
CLANG_WARN_STRICT_PROTOTYPES = YES;
147157
CLANG_WARN_SUSPICIOUS_MOVE = YES;
148158
CLANG_WARN_UNREACHABLE_CODE = YES;
149159
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -185,21 +195,31 @@
185195
buildSettings = {
186196
ALWAYS_SEARCH_USER_PATHS = NO;
187197
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
198+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
188199
CLANG_ANALYZER_NONNULL = YES;
189200
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
190201
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
191202
CLANG_CXX_LIBRARY = "libc++";
192203
CLANG_ENABLE_MODULES = YES;
193204
CLANG_ENABLE_OBJC_ARC = YES;
205+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
194206
CLANG_WARN_BOOL_CONVERSION = YES;
207+
CLANG_WARN_COMMA = YES;
195208
CLANG_WARN_CONSTANT_CONVERSION = YES;
209+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
196210
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
197211
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
198212
CLANG_WARN_EMPTY_BODY = YES;
199213
CLANG_WARN_ENUM_CONVERSION = YES;
200214
CLANG_WARN_INFINITE_RECURSION = YES;
201215
CLANG_WARN_INT_CONVERSION = YES;
216+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
217+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
218+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
202219
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
220+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
221+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
222+
CLANG_WARN_STRICT_PROTOTYPES = YES;
203223
CLANG_WARN_SUSPICIOUS_MOVE = YES;
204224
CLANG_WARN_UNREACHABLE_CODE = YES;
205225
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

ios/RNTwilioVoice.xcodeproj/project.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

ios/RNTwilioVoice.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 0 additions & 8 deletions
This file was deleted.

ios/RNTwilioVoice/RNTwilioVoice.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
//
2-
// TwilioVoice.h
3-
// TwilioVoice
4-
//
5-
61
#import <React/RCTBridgeModule.h>
72
#import <React/RCTEventEmitter.h>
83

ios/RNTwilioVoice/RNTwilioVoice.m

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
//
2-
// TwilioVoice.m
3-
//
4-
51
#import "RNTwilioVoice.h"
62
#import <React/RCTLog.h>
73

package.json

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1"
88
},
9-
"devDependencies": {},
9+
"nativePackage": true,
1010
"homepage": "https://github.com/hoxfon/react-native-twilio-programmable-voice",
1111
"keywords": [
1212
"twilio",
@@ -28,8 +28,15 @@
2828
"type": "git",
2929
"url": "git+ssh://[email protected]:hoxfon/react-native-twilio-programmable-voice.git"
3030
},
31-
"author": {
32-
"name": "Fabrizio Moscon"
31+
"contributors": [
32+
{
33+
"name": "Fabrizio Moscon"
34+
}
35+
],
36+
"dependencies": {},
37+
"devDependencies": {},
38+
"peerDependencies": {
39+
"react-native": ">=0.60.0"
3340
},
3441
"license": "MIT"
3542
}

0 commit comments

Comments
 (0)