Просмотр исходного кода

ios: update to Xcode 5 and Swift 5

master
Saúl Ibarra Corretgé 6 лет назад
Родитель
Сommit
024fc73e63

+ 4
- 2
ios/app/app.xcodeproj/project.pbxproj Просмотреть файл

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

+ 1
- 1
ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme Просмотреть файл

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

+ 9
- 6
ios/sdk/sdk.xcodeproj/project.pbxproj Просмотреть файл

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

+ 1
- 1
ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme Просмотреть файл

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

+ 4
- 3
ios/sdk/src/callkit/JMCallKitEmitter.swift Просмотреть файл

130
 
130
 
131
 fileprivate struct JMCallKitEventListenerWrapper: Hashable {
131
 fileprivate struct JMCallKitEventListenerWrapper: Hashable {
132
 
132
 
133
-    public var hashValue: Int
134
-
135
     internal weak var listener: JMCallKitListener?
133
     internal weak var listener: JMCallKitListener?
136
 
134
 
137
     public init(listener: JMCallKitListener) {
135
     public init(listener: JMCallKitListener) {
138
         self.listener = listener
136
         self.listener = listener
139
-        self.hashValue = listener.hash
140
     }
137
     }
141
 
138
 
142
     public static func ==(lhs: JMCallKitEventListenerWrapper,
139
     public static func ==(lhs: JMCallKitEventListenerWrapper,
145
         // necessarily equal to each other."
142
         // necessarily equal to each other."
146
         return lhs.hashValue == rhs.hashValue
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
 }

Загрузка…
Отмена
Сохранить