Skip to content

Commit 3b33c2e

Browse files
jeremyosterhoudtjeremyosterhoudt
authored
Merge pull request #6 from PredixDev/Swift5_Xcode_10_2
Swift 5 and Xcode 10.2 support
2 parents 490f777 + 72423b8 commit 3b33c2e

File tree

19 files changed

+106
-73
lines changed

19 files changed

+106
-73
lines changed

‎Examples/Authentication/NativeAuthenticationDemo/NativeAuthenticationDemo.xcodeproj/project.pbxproj

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,20 @@
122122
isa = PBXProject;
123123
attributes = {
124124
LastSwiftUpdateCheck = 0830;
125-
LastUpgradeCheck = 0920;
125+
LastUpgradeCheck = 1020;
126126
ORGANIZATIONNAME = GE;
127127
TargetAttributes = {
128128
4F7215381F291696007628E9 = {
129129
CreatedOnToolsVersion = 8.3.3;
130-
LastSwiftMigration = 1000;
130+
DevelopmentTeam = 373EW2K43X;
131+
LastSwiftMigration = 1020;
131132
ProvisioningStyle = Automatic;
132133
};
133134
};
134135
};
135136
buildConfigurationList = 4F7215341F291696007628E9 /* Build configuration list for PBXProject "NativeAuthenticationDemo" */;
136137
compatibilityVersion = "Xcode 3.2";
137-
developmentRegion = English;
138+
developmentRegion = en;
138139
hasScannedForEncodings = 0;
139140
knownRegions = (
140141
en,
@@ -200,6 +201,7 @@
200201
isa = XCBuildConfiguration;
201202
buildSettings = {
202203
ALWAYS_SEARCH_USER_PATHS = NO;
204+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
203205
CLANG_ANALYZER_NONNULL = YES;
204206
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
205207
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -210,13 +212,15 @@
210212
CLANG_WARN_BOOL_CONVERSION = YES;
211213
CLANG_WARN_COMMA = YES;
212214
CLANG_WARN_CONSTANT_CONVERSION = YES;
215+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
213216
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
214217
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
215218
CLANG_WARN_EMPTY_BODY = YES;
216219
CLANG_WARN_ENUM_CONVERSION = YES;
217220
CLANG_WARN_INFINITE_RECURSION = YES;
218221
CLANG_WARN_INT_CONVERSION = YES;
219222
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
223+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
220224
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
221225
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
222226
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -257,6 +261,7 @@
257261
isa = XCBuildConfiguration;
258262
buildSettings = {
259263
ALWAYS_SEARCH_USER_PATHS = NO;
264+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
260265
CLANG_ANALYZER_NONNULL = YES;
261266
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
262267
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -267,13 +272,15 @@
267272
CLANG_WARN_BOOL_CONVERSION = YES;
268273
CLANG_WARN_COMMA = YES;
269274
CLANG_WARN_CONSTANT_CONVERSION = YES;
275+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
270276
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
271277
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
272278
CLANG_WARN_EMPTY_BODY = YES;
273279
CLANG_WARN_ENUM_CONVERSION = YES;
274280
CLANG_WARN_INFINITE_RECURSION = YES;
275281
CLANG_WARN_INT_CONVERSION = YES;
276282
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
283+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
277284
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
278285
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
279286
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -307,7 +314,7 @@
307314
isa = XCBuildConfiguration;
308315
buildSettings = {
309316
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
310-
DEVELOPMENT_TEAM = "";
317+
DEVELOPMENT_TEAM = 373EW2K43X;
311318
FRAMEWORK_SEARCH_PATHS = (
312319
"$(inherited)",
313320
"$(PROJECT_DIR)/../../Frameworks",
@@ -317,15 +324,15 @@
317324
PRODUCT_BUNDLE_IDENTIFIER = com.ge.NativeAuthenticationDemo;
318325
PRODUCT_NAME = "$(TARGET_NAME)";
319326
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/$(PRODUCT_NAME)";
320-
SWIFT_VERSION = 4.2;
327+
SWIFT_VERSION = 5.0;
321328
};
322329
name = Debug;
323330
};
324331
4F72154D1F291696007628E9 /* Release */ = {
325332
isa = XCBuildConfiguration;
326333
buildSettings = {
327334
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
328-
DEVELOPMENT_TEAM = "";
335+
DEVELOPMENT_TEAM = 373EW2K43X;
329336
FRAMEWORK_SEARCH_PATHS = (
330337
"$(inherited)",
331338
"$(PROJECT_DIR)/../../Frameworks",
@@ -335,7 +342,7 @@
335342
PRODUCT_BUNDLE_IDENTIFIER = com.ge.NativeAuthenticationDemo;
336343
PRODUCT_NAME = "$(TARGET_NAME)";
337344
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/$(PRODUCT_NAME)";
338-
SWIFT_VERSION = 4.2;
345+
SWIFT_VERSION = 5.0;
339346
};
340347
name = Release;
341348
};

‎Examples/Authentication/NativeAuthenticationDemo/NativeAuthenticationDemo.xcodeproj/xcshareddata/xcschemes/NativeAuthenticationDemo.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

‎Examples/Authentication/SFAuthenticationSessionDemo/SFAuthenticationSessionDemo.xcodeproj/project.pbxproj

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,19 @@
123123
isa = PBXProject;
124124
attributes = {
125125
LastSwiftUpdateCheck = 0830;
126-
LastUpgradeCheck = 0900;
126+
LastUpgradeCheck = 1020;
127127
ORGANIZATIONNAME = GE;
128128
TargetAttributes = {
129129
4FD899711F2BE64C00602726 = {
130130
CreatedOnToolsVersion = 8.3.3;
131-
LastSwiftMigration = 1000;
131+
LastSwiftMigration = 1020;
132132
ProvisioningStyle = Automatic;
133133
};
134134
};
135135
};
136136
buildConfigurationList = 4FD8996D1F2BE64B00602726 /* Build configuration list for PBXProject "SFAuthenticationSessionDemo" */;
137137
compatibilityVersion = "Xcode 3.2";
138-
developmentRegion = English;
138+
developmentRegion = en;
139139
hasScannedForEncodings = 0;
140140
knownRegions = (
141141
en,
@@ -201,6 +201,7 @@
201201
isa = XCBuildConfiguration;
202202
buildSettings = {
203203
ALWAYS_SEARCH_USER_PATHS = NO;
204+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
204205
CLANG_ANALYZER_NONNULL = YES;
205206
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
206207
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -211,13 +212,15 @@
211212
CLANG_WARN_BOOL_CONVERSION = YES;
212213
CLANG_WARN_COMMA = YES;
213214
CLANG_WARN_CONSTANT_CONVERSION = YES;
215+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
214216
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
215217
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
216218
CLANG_WARN_EMPTY_BODY = YES;
217219
CLANG_WARN_ENUM_CONVERSION = YES;
218220
CLANG_WARN_INFINITE_RECURSION = YES;
219221
CLANG_WARN_INT_CONVERSION = YES;
220222
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
223+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
221224
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
222225
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
223226
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -258,6 +261,7 @@
258261
isa = XCBuildConfiguration;
259262
buildSettings = {
260263
ALWAYS_SEARCH_USER_PATHS = NO;
264+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
261265
CLANG_ANALYZER_NONNULL = YES;
262266
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
263267
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -268,13 +272,15 @@
268272
CLANG_WARN_BOOL_CONVERSION = YES;
269273
CLANG_WARN_COMMA = YES;
270274
CLANG_WARN_CONSTANT_CONVERSION = YES;
275+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
271276
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
272277
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
273278
CLANG_WARN_EMPTY_BODY = YES;
274279
CLANG_WARN_ENUM_CONVERSION = YES;
275280
CLANG_WARN_INFINITE_RECURSION = YES;
276281
CLANG_WARN_INT_CONVERSION = YES;
277282
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
283+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
278284
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
279285
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
280286
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -318,7 +324,7 @@
318324
PRODUCT_BUNDLE_IDENTIFIER = com.ge.SFAuthenticationSessionDemo;
319325
PRODUCT_NAME = "$(TARGET_NAME)";
320326
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/$(PRODUCT_NAME)";
321-
SWIFT_VERSION = 4.2;
327+
SWIFT_VERSION = 5.0;
322328
};
323329
name = Debug;
324330
};
@@ -336,7 +342,7 @@
336342
PRODUCT_BUNDLE_IDENTIFIER = com.ge.SFAuthenticationSessionDemo;
337343
PRODUCT_NAME = "$(TARGET_NAME)";
338344
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/$(PRODUCT_NAME)";
339-
SWIFT_VERSION = 4.2;
345+
SWIFT_VERSION = 5.0;
340346
};
341347
name = Release;
342348
};

‎Examples/Authentication/SFAuthenticationSessionDemo/SFAuthenticationSessionDemo.xcodeproj/xcshareddata/xcschemes/SFAuthenticationSessionDemo.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

‎Examples/Authentication/SafariViewControllerDemo/SafariViewControllerDemo.xcodeproj/project.pbxproj

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,19 @@
123123
isa = PBXProject;
124124
attributes = {
125125
LastSwiftUpdateCheck = 0830;
126-
LastUpgradeCheck = 0920;
126+
LastUpgradeCheck = 1020;
127127
ORGANIZATIONNAME = GE;
128128
TargetAttributes = {
129129
4FD899711F2BE64C00602726 = {
130130
CreatedOnToolsVersion = 8.3.3;
131-
LastSwiftMigration = 1000;
131+
LastSwiftMigration = 1020;
132132
ProvisioningStyle = Automatic;
133133
};
134134
};
135135
};
136136
buildConfigurationList = 4FD8996D1F2BE64B00602726 /* Build configuration list for PBXProject "SafariViewControllerDemo" */;
137137
compatibilityVersion = "Xcode 3.2";
138-
developmentRegion = English;
138+
developmentRegion = en;
139139
hasScannedForEncodings = 0;
140140
knownRegions = (
141141
en,
@@ -201,6 +201,7 @@
201201
isa = XCBuildConfiguration;
202202
buildSettings = {
203203
ALWAYS_SEARCH_USER_PATHS = NO;
204+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
204205
CLANG_ANALYZER_NONNULL = YES;
205206
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
206207
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -211,13 +212,15 @@
211212
CLANG_WARN_BOOL_CONVERSION = YES;
212213
CLANG_WARN_COMMA = YES;
213214
CLANG_WARN_CONSTANT_CONVERSION = YES;
215+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
214216
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
215217
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
216218
CLANG_WARN_EMPTY_BODY = YES;
217219
CLANG_WARN_ENUM_CONVERSION = YES;
218220
CLANG_WARN_INFINITE_RECURSION = YES;
219221
CLANG_WARN_INT_CONVERSION = YES;
220222
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
223+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
221224
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
222225
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
223226
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -258,6 +261,7 @@
258261
isa = XCBuildConfiguration;
259262
buildSettings = {
260263
ALWAYS_SEARCH_USER_PATHS = NO;
264+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
261265
CLANG_ANALYZER_NONNULL = YES;
262266
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
263267
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -268,13 +272,15 @@
268272
CLANG_WARN_BOOL_CONVERSION = YES;
269273
CLANG_WARN_COMMA = YES;
270274
CLANG_WARN_CONSTANT_CONVERSION = YES;
275+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
271276
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
272277
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
273278
CLANG_WARN_EMPTY_BODY = YES;
274279
CLANG_WARN_ENUM_CONVERSION = YES;
275280
CLANG_WARN_INFINITE_RECURSION = YES;
276281
CLANG_WARN_INT_CONVERSION = YES;
277282
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
283+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
278284
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
279285
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
280286
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -318,7 +324,7 @@
318324
PRODUCT_BUNDLE_IDENTIFIER = com.ge.SafariViewControllerDemo;
319325
PRODUCT_NAME = "$(TARGET_NAME)";
320326
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/$(PRODUCT_NAME)";
321-
SWIFT_VERSION = 4.2;
327+
SWIFT_VERSION = 5.0;
322328
};
323329
name = Debug;
324330
};
@@ -336,7 +342,7 @@
336342
PRODUCT_BUNDLE_IDENTIFIER = com.ge.SafariViewControllerDemo;
337343
PRODUCT_NAME = "$(TARGET_NAME)";
338344
SWIFT_INCLUDE_PATHS = "$(SRCROOT)/$(PRODUCT_NAME)";
339-
SWIFT_VERSION = 4.2;
345+
SWIFT_VERSION = 5.0;
340346
};
341347
name = Release;
342348
};

‎Examples/Authentication/SafariViewControllerDemo/SafariViewControllerDemo.xcodeproj/xcshareddata/xcschemes/SafariViewControllerDemo.xcscheme

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Debug"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)