浏览代码

ios: update to Xcode 5 and Swift 5

j8
Saúl Ibarra Corretgé 6 年前
父节点
当前提交
024fc73e63

+ 4
- 2
ios/app/app.xcodeproj/project.pbxproj 查看文件

@@ -166,7 +166,7 @@
166 166
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
167 167
 			isa = PBXProject;
168 168
 			attributes = {
169
-				LastUpgradeCheck = 1000;
169
+				LastUpgradeCheck = 1020;
170 170
 				ORGANIZATIONNAME = Facebook;
171 171
 				TargetAttributes = {
172 172
 					13B07F861A680F5B00A75B9A = {
@@ -185,7 +185,7 @@
185 185
 			};
186 186
 			buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "app" */;
187 187
 			compatibilityVersion = "Xcode 3.2";
188
-			developmentRegion = English;
188
+			developmentRegion = en;
189 189
 			hasScannedForEncodings = 0;
190 190
 			knownRegions = (
191 191
 				en,
@@ -456,6 +456,7 @@
456 456
 			isa = XCBuildConfiguration;
457 457
 			buildSettings = {
458 458
 				ALWAYS_SEARCH_USER_PATHS = NO;
459
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
459 460
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
460 461
 				CLANG_CXX_LIBRARY = "libc++";
461 462
 				CLANG_ENABLE_MODULES = YES;
@@ -514,6 +515,7 @@
514 515
 			isa = XCBuildConfiguration;
515 516
 			buildSettings = {
516 517
 				ALWAYS_SEARCH_USER_PATHS = NO;
518
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
517 519
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
518 520
 				CLANG_CXX_LIBRARY = "libc++";
519 521
 				CLANG_ENABLE_MODULES = YES;

+ 1
- 1
ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme 查看文件

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <Scheme
3
-   LastUpgradeVersion = "1000"
3
+   LastUpgradeVersion = "1020"
4 4
    version = "1.3">
5 5
    <BuildAction
6 6
       parallelizeBuildables = "NO"

+ 9
- 6
ios/sdk/sdk.xcodeproj/project.pbxproj 查看文件

@@ -293,7 +293,7 @@
293 293
 		0BD906DC1EC0C00300C8C18E /* Project object */ = {
294 294
 			isa = PBXProject;
295 295
 			attributes = {
296
-				LastUpgradeCheck = 1000;
296
+				LastUpgradeCheck = 1020;
297 297
 				ORGANIZATIONNAME = Jitsi;
298 298
 				TargetAttributes = {
299 299
 					0BD906E41EC0C00300C8C18E = {
@@ -305,10 +305,11 @@
305 305
 			};
306 306
 			buildConfigurationList = 0BD906DF1EC0C00300C8C18E /* Build configuration list for PBXProject "sdk" */;
307 307
 			compatibilityVersion = "Xcode 3.2";
308
-			developmentRegion = English;
308
+			developmentRegion = en;
309 309
 			hasScannedForEncodings = 0;
310 310
 			knownRegions = (
311 311
 				en,
312
+				Base,
312 313
 			);
313 314
 			mainGroup = 0BD906DB1EC0C00300C8C18E;
314 315
 			productRefGroup = 0BD906E61EC0C00300C8C18E /* Products */;
@@ -486,6 +487,7 @@
486 487
 			isa = XCBuildConfiguration;
487 488
 			buildSettings = {
488 489
 				ALWAYS_SEARCH_USER_PATHS = NO;
490
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
489 491
 				CLANG_ANALYZER_NONNULL = YES;
490 492
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
491 493
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -547,6 +549,7 @@
547 549
 			isa = XCBuildConfiguration;
548 550
 			buildSettings = {
549 551
 				ALWAYS_SEARCH_USER_PATHS = NO;
552
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
550 553
 				CLANG_ANALYZER_NONNULL = YES;
551 554
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
552 555
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -622,8 +625,8 @@
622 625
 				SKIP_INSTALL = YES;
623 626
 				SWIFT_OBJC_BRIDGING_HEADER = "";
624 627
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
625
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
626
-				SWIFT_VERSION = 4.2;
628
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
629
+				SWIFT_VERSION = 5.0;
627 630
 			};
628 631
 			name = Debug;
629 632
 		};
@@ -649,8 +652,8 @@
649 652
 				PROVISIONING_PROFILE_SPECIFIER = "";
650 653
 				SKIP_INSTALL = YES;
651 654
 				SWIFT_OBJC_BRIDGING_HEADER = "";
652
-				SWIFT_SWIFT3_OBJC_INFERENCE = On;
653
-				SWIFT_VERSION = 4.2;
655
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
656
+				SWIFT_VERSION = 5.0;
654 657
 			};
655 658
 			name = Release;
656 659
 		};

+ 1
- 1
ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme 查看文件

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <Scheme
3
-   LastUpgradeVersion = "1000"
3
+   LastUpgradeVersion = "1020"
4 4
    version = "1.7">
5 5
    <BuildAction
6 6
       parallelizeBuildables = "YES"

+ 4
- 3
ios/sdk/src/callkit/JMCallKitEmitter.swift 查看文件

@@ -130,13 +130,10 @@ internal final class JMCallKitEmitter: NSObject, CXProviderDelegate {
130 130
 
131 131
 fileprivate struct JMCallKitEventListenerWrapper: Hashable {
132 132
 
133
-    public var hashValue: Int
134
-
135 133
     internal weak var listener: JMCallKitListener?
136 134
 
137 135
     public init(listener: JMCallKitListener) {
138 136
         self.listener = listener
139
-        self.hashValue = listener.hash
140 137
     }
141 138
 
142 139
     public static func ==(lhs: JMCallKitEventListenerWrapper,
@@ -145,4 +142,8 @@ fileprivate struct JMCallKitEventListenerWrapper: Hashable {
145 142
         // necessarily equal to each other."
146 143
         return lhs.hashValue == rhs.hashValue
147 144
     }
145
+
146
+    func hash(into hasher: inout Hasher) {
147
+        hasher.combine(self.listener?.hash)
148
+    }
148 149
 }

正在加载...
取消
保存