Skip to content

Commit f9d9ee6

Browse files
jaeoptthomaszurkan-optimizely
jaeopt
authored and
thomaszurkan-optimizely
committed
fix: change Swift requirement to Swift 5 (#251)
* fix to swift5+ everywhere * fix a test case for swift5 * cleanup
1 parent 543dfd1 commit f9d9ee6

File tree

9 files changed

+45
-69
lines changed

9 files changed

+45
-69
lines changed

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

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

‎.swiftpm/xcode/package.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

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

‎DemoSwiftApp/DemoSwiftApp.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@
719719
MTL_FAST_MATH = YES;
720720
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.DemoSwiftiOS;
721721
PRODUCT_NAME = "$(TARGET_NAME)";
722-
SWIFT_VERSION = 4.2;
722+
SWIFT_VERSION = 5.0;
723723
TARGETED_DEVICE_FAMILY = "1,2";
724724
};
725725
name = Debug;
@@ -743,7 +743,7 @@
743743
MTL_FAST_MATH = YES;
744744
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.DemoSwiftiOS;
745745
PRODUCT_NAME = "$(TARGET_NAME)";
746-
SWIFT_VERSION = 4.2;
746+
SWIFT_VERSION = 5.0;
747747
TARGETED_DEVICE_FAMILY = "1,2";
748748
};
749749
name = Release;
@@ -772,7 +772,7 @@
772772
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.DemoSwifttvOS;
773773
PRODUCT_NAME = "$(TARGET_NAME)";
774774
SDKROOT = appletvos;
775-
SWIFT_VERSION = 4.2;
775+
SWIFT_VERSION = 5.0;
776776
TARGETED_DEVICE_FAMILY = 3;
777777
};
778778
name = Debug;
@@ -796,7 +796,7 @@
796796
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.DemoSwifttvOS;
797797
PRODUCT_NAME = "$(TARGET_NAME)";
798798
SDKROOT = appletvos;
799-
SWIFT_VERSION = 4.2;
799+
SWIFT_VERSION = 5.0;
800800
TARGETED_DEVICE_FAMILY = 3;
801801
};
802802
name = Release;
@@ -862,7 +862,7 @@
862862
SDKROOT = iphoneos;
863863
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
864864
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
865-
SWIFT_VERSION = 4.2;
865+
SWIFT_VERSION = 5.0;
866866
TARGETED_DEVICE_FAMILY = "1,2";
867867
TVOS_DEPLOYMENT_TARGET = 9.0;
868868
};
@@ -918,7 +918,7 @@
918918
MTL_ENABLE_DEBUG_INFO = NO;
919919
SDKROOT = iphoneos;
920920
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
921-
SWIFT_VERSION = 4.2;
921+
SWIFT_VERSION = 5.0;
922922
TARGETED_DEVICE_FAMILY = "1,2";
923923
TVOS_DEPLOYMENT_TARGET = 9.0;
924924
VALIDATE_PRODUCT = YES;

‎OptimizelySwiftSDK.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22
s.name = "OptimizelySwiftSDK"
33
s.module_name = "Optimizely"
4-
s.version = "3.1.0-beta"
4+
s.version = "3.1.0"
55
s.summary = "Optimizely experiment framework for iOS/tvOS"
66
s.homepage = "https://docs.developers.optimizely.com/full-stack/docs"
77
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }

‎OptimizelySwiftSDK.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3523,6 +3523,7 @@
35233523
SDKROOT = iphoneos;
35243524
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
35253525
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
3526+
SWIFT_VERSION = 5.0;
35263527
VERSIONING_SYSTEM = "apple-generic";
35273528
VERSION_INFO_PREFIX = "";
35283529
};
@@ -3581,6 +3582,7 @@
35813582
SDKROOT = iphoneos;
35823583
SWIFT_COMPILATION_MODE = wholemodule;
35833584
SWIFT_OPTIMIZATION_LEVEL = "-O";
3585+
SWIFT_VERSION = 5.0;
35843586
VALIDATE_PRODUCT = YES;
35853587
VERSIONING_SYSTEM = "apple-generic";
35863588
VERSION_INFO_PREFIX = "";
@@ -3607,7 +3609,7 @@
36073609
PRODUCT_NAME = Optimizely;
36083610
SDKROOT = appletvos;
36093611
SKIP_INSTALL = YES;
3610-
SWIFT_VERSION = 4.2;
3612+
SWIFT_VERSION = 5.0;
36113613
TARGETED_DEVICE_FAMILY = 3;
36123614
TVOS_DEPLOYMENT_TARGET = 9.0;
36133615
};
@@ -3633,7 +3635,7 @@
36333635
PRODUCT_NAME = Optimizely;
36343636
SDKROOT = appletvos;
36353637
SKIP_INSTALL = YES;
3636-
SWIFT_VERSION = 4.2;
3638+
SWIFT_VERSION = 5.0;
36373639
TARGETED_DEVICE_FAMILY = 3;
36383640
TVOS_DEPLOYMENT_TARGET = 9.0;
36393641
};
@@ -3654,7 +3656,7 @@
36543656
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.OptimizelySwiftSDKtvOSTests;
36553657
PRODUCT_NAME = "$(TARGET_NAME)";
36563658
SDKROOT = appletvos;
3657-
SWIFT_VERSION = 4.2;
3659+
SWIFT_VERSION = 5.0;
36583660
TARGETED_DEVICE_FAMILY = 3;
36593661
TVOS_DEPLOYMENT_TARGET = 10.0;
36603662
};
@@ -3675,7 +3677,7 @@
36753677
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.OptimizelySwiftSDKtvOSTests;
36763678
PRODUCT_NAME = "$(TARGET_NAME)";
36773679
SDKROOT = appletvos;
3678-
SWIFT_VERSION = 4.2;
3680+
SWIFT_VERSION = 5.0;
36793681
TARGETED_DEVICE_FAMILY = 3;
36803682
TVOS_DEPLOYMENT_TARGET = 9.0;
36813683
};
@@ -3696,7 +3698,7 @@
36963698
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-APIs-iOS";
36973699
PRODUCT_NAME = "$(TARGET_NAME)";
36983700
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
3699-
SWIFT_VERSION = 4.2;
3701+
SWIFT_VERSION = 5.0;
37003702
TARGETED_DEVICE_FAMILY = "1,2";
37013703
};
37023704
name = Debug;
@@ -3715,7 +3717,7 @@
37153717
);
37163718
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-APIs-iOS";
37173719
PRODUCT_NAME = "$(TARGET_NAME)";
3718-
SWIFT_VERSION = 4.2;
3720+
SWIFT_VERSION = 5.0;
37193721
TARGETED_DEVICE_FAMILY = "1,2";
37203722
};
37213723
name = Release;
@@ -3733,7 +3735,7 @@
37333735
);
37343736
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-Legacy-iOS";
37353737
PRODUCT_NAME = "$(TARGET_NAME)";
3736-
SWIFT_VERSION = 4.2;
3738+
SWIFT_VERSION = 5.0;
37373739
TARGETED_DEVICE_FAMILY = "1,2";
37383740
};
37393741
name = Debug;
@@ -3751,7 +3753,7 @@
37513753
);
37523754
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-Legacy-iOS";
37533755
PRODUCT_NAME = "$(TARGET_NAME)";
3754-
SWIFT_VERSION = 4.2;
3756+
SWIFT_VERSION = 5.0;
37553757
TARGETED_DEVICE_FAMILY = "1,2";
37563758
};
37573759
name = Release;
@@ -3770,7 +3772,7 @@
37703772
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelySwiftSDKTests-Common-tvOS";
37713773
PRODUCT_NAME = "$(TARGET_NAME)";
37723774
SDKROOT = appletvos;
3773-
SWIFT_VERSION = 4.2;
3775+
SWIFT_VERSION = 5.0;
37743776
TARGETED_DEVICE_FAMILY = 3;
37753777
TVOS_DEPLOYMENT_TARGET = 10.0;
37763778
};
@@ -3790,7 +3792,7 @@
37903792
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelySwiftSDKTests-Common-tvOS";
37913793
PRODUCT_NAME = "$(TARGET_NAME)";
37923794
SDKROOT = appletvos;
3793-
SWIFT_VERSION = 4.2;
3795+
SWIFT_VERSION = 5.0;
37943796
TARGETED_DEVICE_FAMILY = 3;
37953797
TVOS_DEPLOYMENT_TARGET = 10.0;
37963798
};
@@ -3810,7 +3812,7 @@
38103812
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-DataModel-tvOS";
38113813
PRODUCT_NAME = "$(TARGET_NAME)";
38123814
SDKROOT = appletvos;
3813-
SWIFT_VERSION = 4.2;
3815+
SWIFT_VERSION = 5.0;
38143816
TARGETED_DEVICE_FAMILY = 3;
38153817
TVOS_DEPLOYMENT_TARGET = 10.0;
38163818
};
@@ -3830,7 +3832,7 @@
38303832
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-DataModel-tvOS";
38313833
PRODUCT_NAME = "$(TARGET_NAME)";
38323834
SDKROOT = appletvos;
3833-
SWIFT_VERSION = 4.2;
3835+
SWIFT_VERSION = 5.0;
38343836
TARGETED_DEVICE_FAMILY = 3;
38353837
TVOS_DEPLOYMENT_TARGET = 10.0;
38363838
};
@@ -3849,7 +3851,7 @@
38493851
);
38503852
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-Commons-iOS";
38513853
PRODUCT_NAME = "$(TARGET_NAME)";
3852-
SWIFT_VERSION = 4.2;
3854+
SWIFT_VERSION = 5.0;
38533855
TARGETED_DEVICE_FAMILY = "1,2";
38543856
};
38553857
name = Debug;
@@ -3867,7 +3869,7 @@
38673869
);
38683870
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-Commons-iOS";
38693871
PRODUCT_NAME = "$(TARGET_NAME)";
3870-
SWIFT_VERSION = 4.2;
3872+
SWIFT_VERSION = 5.0;
38713873
TARGETED_DEVICE_FAMILY = "1,2";
38723874
};
38733875
name = Release;
@@ -3885,7 +3887,7 @@
38853887
);
38863888
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-DataModels-iOS";
38873889
PRODUCT_NAME = "$(TARGET_NAME)";
3888-
SWIFT_VERSION = 4.2;
3890+
SWIFT_VERSION = 5.0;
38893891
TARGETED_DEVICE_FAMILY = "1,2";
38903892
};
38913893
name = Debug;
@@ -3903,7 +3905,7 @@
39033905
);
39043906
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-DataModels-iOS";
39053907
PRODUCT_NAME = "$(TARGET_NAME)";
3906-
SWIFT_VERSION = 4.2;
3908+
SWIFT_VERSION = 5.0;
39073909
TARGETED_DEVICE_FAMILY = "1,2";
39083910
};
39093911
name = Release;
@@ -3921,7 +3923,7 @@
39213923
);
39223924
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-Others-iOS";
39233925
PRODUCT_NAME = "$(TARGET_NAME)";
3924-
SWIFT_VERSION = 4.2;
3926+
SWIFT_VERSION = 5.0;
39253927
TARGETED_DEVICE_FAMILY = "1,2";
39263928
};
39273929
name = Debug;
@@ -3939,7 +3941,7 @@
39393941
);
39403942
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-Others-iOS";
39413943
PRODUCT_NAME = "$(TARGET_NAME)";
3942-
SWIFT_VERSION = 4.2;
3944+
SWIFT_VERSION = 5.0;
39433945
TARGETED_DEVICE_FAMILY = "1,2";
39443946
};
39453947
name = Release;
@@ -3958,7 +3960,7 @@
39583960
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-Others-tvOS";
39593961
PRODUCT_NAME = "$(TARGET_NAME)";
39603962
SDKROOT = appletvos;
3961-
SWIFT_VERSION = 4.2;
3963+
SWIFT_VERSION = 5.0;
39623964
TARGETED_DEVICE_FAMILY = 3;
39633965
TVOS_DEPLOYMENT_TARGET = 10.0;
39643966
};
@@ -3978,7 +3980,7 @@
39783980
PRODUCT_BUNDLE_IDENTIFIER = "com.optimizely.abcExtended.OptimizelyTests-Others-tvOS";
39793981
PRODUCT_NAME = "$(TARGET_NAME)";
39803982
SDKROOT = appletvos;
3981-
SWIFT_VERSION = 4.2;
3983+
SWIFT_VERSION = 5.0;
39823984
TARGETED_DEVICE_FAMILY = 3;
39833985
TVOS_DEPLOYMENT_TARGET = 10.0;
39843986
};
@@ -4004,7 +4006,7 @@
40044006
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.OptimizelySwiftSDK;
40054007
PRODUCT_NAME = Optimizely;
40064008
SKIP_INSTALL = YES;
4007-
SWIFT_VERSION = 4.2;
4009+
SWIFT_VERSION = 5.0;
40084010
TARGETED_DEVICE_FAMILY = "1,2";
40094011
};
40104012
name = Debug;
@@ -4029,7 +4031,7 @@
40294031
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.OptimizelySwiftSDK;
40304032
PRODUCT_NAME = Optimizely;
40314033
SKIP_INSTALL = YES;
4032-
SWIFT_VERSION = 4.2;
4034+
SWIFT_VERSION = 5.0;
40334035
TARGETED_DEVICE_FAMILY = "1,2";
40344036
};
40354037
name = Release;
@@ -4048,7 +4050,7 @@
40484050
);
40494051
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.OptimizelySwiftSDKiOSTests;
40504052
PRODUCT_NAME = "$(TARGET_NAME)";
4051-
SWIFT_VERSION = 4.2;
4053+
SWIFT_VERSION = 5.0;
40524054
TARGETED_DEVICE_FAMILY = "1,2";
40534055
};
40544056
name = Debug;
@@ -4067,7 +4069,7 @@
40674069
);
40684070
PRODUCT_BUNDLE_IDENTIFIER = com.optimizely.OptimizelySwiftSDKiOSTests;
40694071
PRODUCT_NAME = "$(TARGET_NAME)";
4070-
SWIFT_VERSION = 4.2;
4072+
SWIFT_VERSION = 5.0;
40714073
TARGETED_DEVICE_FAMILY = "1,2";
40724074
};
40734075
name = Release;

‎Podfile‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,3 @@ target 'DemoObjctvOS' do
4444
use_frameworks!
4545
#pod 'OptimizelySwiftSDK','3.0.0'
4646
end
47-
48-
post_install do |installer|
49-
installer.pods_project.build_configurations.each do |config|
50-
config.build_settings.delete('CODE_SIGNING_ALLOWED')
51-
config.build_settings.delete('CODE_SIGNING_REQUIRED')
52-
end
53-
installer.pods_project.targets.each do |target|
54-
target.build_configurations.each do |config|
55-
config.build_settings['SWIFT_VERSION'] = '4.2'
56-
end
57-
end
58-
end

‎Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PODS:
2-
- SwiftLint (0.33.0)
2+
- SwiftLint (0.34.0)
33

44
DEPENDENCIES:
55
- SwiftLint
@@ -9,7 +9,7 @@ SPEC REPOS:
99
- SwiftLint
1010

1111
SPEC CHECKSUMS:
12-
SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
12+
SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67
1313

1414
PODFILE CHECKSUM: 124cba10dd18bf1a949a3ee13f24f576646bf827
1515

0 commit comments

Comments
 (0)