Skip to content

Commit afb6316

Browse files
e-marchande-marchand
committed
Update project to xcode 10.2 and swift 5
1 parent 98d5278 commit afb6316

File tree

6 files changed

+29
-24
lines changed

6 files changed

+29
-24
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2
1+
5.0

‎CallbackURLKit.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
22

33
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
44
s.name = "CallbackURLKit"
5-
s.version = "2.2.0"
5+
s.version = "2.3.0"
66
s.summary = "Implemenation of x-callback-url in swift"
77
s.homepage = "https://github.com/phimage/CallbackURLKit"
88

‎CallbackURLKit.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,12 @@
249249
C4A8D5071C37D84A00DB3306 /* Project object */ = {
250250
isa = PBXProject;
251251
attributes = {
252-
LastUpgradeCheck = 0940;
252+
LastUpgradeCheck = 1020;
253253
ORGANIZATIONNAME = phimage;
254254
TargetAttributes = {
255255
C418B1D91C386C160097FDD9 = {
256256
CreatedOnToolsVersion = 7.2;
257+
LastSwiftMigration = 1020;
257258
};
258259
C4A8D50F1C37D84A00DB3306 = {
259260
CreatedOnToolsVersion = 7.2;
@@ -267,10 +268,11 @@
267268
};
268269
buildConfigurationList = C4A8D50A1C37D84A00DB3306 /* Build configuration list for PBXProject "CallbackURLKit" */;
269270
compatibilityVersion = "Xcode 3.2";
270-
developmentRegion = English;
271+
developmentRegion = en;
271272
hasScannedForEncodings = 0;
272273
knownRegions = (
273274
en,
275+
Base,
274276
);
275277
mainGroup = C4A8D5061C37D84A00DB3306;
276278
productRefGroup = C4A8D5111C37D84A00DB3306 /* Products */;
@@ -371,8 +373,7 @@
371373
PRODUCT_NAME = CallbackURLKit;
372374
SDKROOT = macosx;
373375
SKIP_INSTALL = YES;
374-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
375-
SWIFT_VERSION = 4.2;
376+
SWIFT_VERSION = 5.0;
376377
};
377378
name = Debug;
378379
};
@@ -394,15 +395,15 @@
394395
PRODUCT_NAME = CallbackURLKit;
395396
SDKROOT = macosx;
396397
SKIP_INSTALL = YES;
397-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
398-
SWIFT_VERSION = 4.2;
398+
SWIFT_VERSION = 5.0;
399399
};
400400
name = Release;
401401
};
402402
C4A8D5161C37D84A00DB3306 /* Debug */ = {
403403
isa = XCBuildConfiguration;
404404
buildSettings = {
405405
ALWAYS_SEARCH_USER_PATHS = NO;
406+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
406407
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
407408
CLANG_CXX_LIBRARY = "libc++";
408409
CLANG_ENABLE_MODULES = YES;
@@ -446,13 +447,13 @@
446447
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
447448
GCC_WARN_UNUSED_FUNCTION = YES;
448449
GCC_WARN_UNUSED_VARIABLE = YES;
449-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
450-
MACOSX_DEPLOYMENT_TARGET = 10.9;
450+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
451+
MACOSX_DEPLOYMENT_TARGET = 10.10;
451452
MTL_ENABLE_DEBUG_INFO = YES;
452453
ONLY_ACTIVE_ARCH = YES;
453454
SDKROOT = iphoneos;
454455
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
455-
SWIFT_VERSION = 4.2;
456+
SWIFT_VERSION = 5.0;
456457
TARGETED_DEVICE_FAMILY = "1,2";
457458
VERSIONING_SYSTEM = "apple-generic";
458459
VERSION_INFO_PREFIX = "";
@@ -463,6 +464,7 @@
463464
isa = XCBuildConfiguration;
464465
buildSettings = {
465466
ALWAYS_SEARCH_USER_PATHS = NO;
467+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
466468
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
467469
CLANG_CXX_LIBRARY = "libc++";
468470
CLANG_ENABLE_MODULES = YES;
@@ -500,12 +502,12 @@
500502
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
501503
GCC_WARN_UNUSED_FUNCTION = YES;
502504
GCC_WARN_UNUSED_VARIABLE = YES;
503-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
504-
MACOSX_DEPLOYMENT_TARGET = 10.9;
505+
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
506+
MACOSX_DEPLOYMENT_TARGET = 10.10;
505507
MTL_ENABLE_DEBUG_INFO = NO;
506508
SDKROOT = iphoneos;
507509
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
508-
SWIFT_VERSION = 4.2;
510+
SWIFT_VERSION = 5.0;
509511
TARGETED_DEVICE_FAMILY = "1,2";
510512
VALIDATE_PRODUCT = YES;
511513
VERSIONING_SYSTEM = "apple-generic";
@@ -530,7 +532,7 @@
530532
PRODUCT_NAME = "$(TARGET_NAME)";
531533
SKIP_INSTALL = YES;
532534
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
533-
SWIFT_VERSION = 4.2;
535+
SWIFT_VERSION = 5.0;
534536
};
535537
name = Debug;
536538
};
@@ -550,7 +552,7 @@
550552
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKit;
551553
PRODUCT_NAME = "$(TARGET_NAME)";
552554
SKIP_INSTALL = YES;
553-
SWIFT_VERSION = 4.2;
555+
SWIFT_VERSION = 5.0;
554556
};
555557
name = Release;
556558
};
@@ -569,7 +571,7 @@
569571
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitClients;
570572
PRODUCT_NAME = "$(TARGET_NAME)";
571573
SKIP_INSTALL = YES;
572-
SWIFT_VERSION = 4.2;
574+
SWIFT_VERSION = 5.0;
573575
};
574576
name = Debug;
575577
};
@@ -588,7 +590,7 @@
588590
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitClients;
589591
PRODUCT_NAME = "$(TARGET_NAME)";
590592
SKIP_INSTALL = YES;
591-
SWIFT_VERSION = 4.2;
593+
SWIFT_VERSION = 5.0;
592594
};
593595
name = Release;
594596
};

‎CallbackURLKit.xcodeproj/xcshareddata/xcschemes/CallbackURLKit.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎CallbackURLKit.xcodeproj/xcshareddata/xcschemes/CallbackURLKitOSX.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SampleApp/CallbackURLKitDemo.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,12 @@
169169
isa = PBXProject;
170170
attributes = {
171171
LastSwiftUpdateCheck = 0720;
172-
LastUpgradeCheck = 1010;
172+
LastUpgradeCheck = 1020;
173173
ORGANIZATIONNAME = phimage;
174174
TargetAttributes = {
175175
C4A4AA831C399A1500932E7D = {
176176
CreatedOnToolsVersion = 7.2;
177+
LastSwiftMigration = 1020;
177178
};
178179
C4E32D671C3999AE005CD033 = {
179180
CreatedOnToolsVersion = 7.2;
@@ -183,7 +184,7 @@
183184
};
184185
buildConfigurationList = C4E32D631C3999AE005CD033 /* Build configuration list for PBXProject "CallbackURLKitDemo" */;
185186
compatibilityVersion = "Xcode 3.2";
186-
developmentRegion = English;
187+
developmentRegion = en;
187188
hasScannedForEncodings = 0;
188189
knownRegions = (
189190
en,
@@ -359,7 +360,7 @@
359360
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitDemoOSX;
360361
PRODUCT_NAME = "$(TARGET_NAME)";
361362
SDKROOT = macosx;
362-
SWIFT_VERSION = 4.2;
363+
SWIFT_VERSION = 5.0;
363364
};
364365
name = Debug;
365366
};
@@ -376,14 +377,15 @@
376377
PRODUCT_BUNDLE_IDENTIFIER = fr.phimage.CallbackURLKitDemoOSX;
377378
PRODUCT_NAME = "$(TARGET_NAME)";
378379
SDKROOT = macosx;
379-
SWIFT_VERSION = 4.2;
380+
SWIFT_VERSION = 5.0;
380381
};
381382
name = Release;
382383
};
383384
C4E32D781C3999AE005CD033 /* Debug */ = {
384385
isa = XCBuildConfiguration;
385386
buildSettings = {
386387
ALWAYS_SEARCH_USER_PATHS = NO;
388+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
387389
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
388390
CLANG_CXX_LIBRARY = "libc++";
389391
CLANG_ENABLE_MODULES = YES;
@@ -440,6 +442,7 @@
440442
isa = XCBuildConfiguration;
441443
buildSettings = {
442444
ALWAYS_SEARCH_USER_PATHS = NO;
445+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
443446
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
444447
CLANG_CXX_LIBRARY = "libc++";
445448
CLANG_ENABLE_MODULES = YES;

0 commit comments

Comments
 (0)