Skip to content

Commit 476e5c0

Browse files
jaeoptjaeopt
authored
chore: add 5.1 to podspec swift_version (#267)
* add 5.1 to podspec swift_version
1 parent 60050a6 commit 476e5c0

12 files changed

+32
-21
lines changed

‎.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
os: osx
5151
osx_image: xcode10.2
5252
install:
53-
- gem install cocoapods -v '1.6.1'
53+
- gem install cocoapods -v '1.8.0'
5454
script:
5555
- pod spec lint --quick
5656
after_script:
@@ -68,8 +68,9 @@ jobs:
6868
name: PLATFORM='iOS Simulator' OS=12.1 NAME='iPhone 7'
6969
install:
7070
- gem install slather --no-document --quiet
71-
- gem install cocoapods -v '1.6.1'
72-
- pod install --repo-update
71+
- gem install cocoapods -v '1.8.0'
72+
- pod repo update
73+
- pod install
7374
# fix simulator known issue (https://developer.apple.com/documentation/xcode_release_notes/xcode_10_2_1_release_notes)
7475
- sudo mkdir '/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 9.3.simruntime/Contents/Resources/RuntimeRoot/usr/lib/swift'
7576
# install jq without cleaning up
@@ -108,7 +109,7 @@ jobs:
108109
# install hub
109110
- wget https://github.com/github/hub/releases/download/v2.11.2/hub-darwin-amd64-2.11.2.tgz -O /tmp/hub-darwin-amd64-2.11.2.tgz && tar -xvf /tmp/hub-darwin-amd64-2.11.2.tgz -C /usr/local/opt && ln -s /usr/local/opt/hub-darwin-amd64-2.11.2/bin/hub /usr/local/bin/hub
110111
# upgrade cocoapods
111-
- gem install cocoapods -v '1.6.1'
112+
- gem install cocoapods -v '1.8.0'
112113
script:
113114
- Scripts/run_prep.sh
114115
after_failure:
@@ -125,6 +126,6 @@ jobs:
125126
# install hub
126127
- wget https://github.com/github/hub/releases/download/v2.11.2/hub-darwin-amd64-2.11.2.tgz -O /tmp/hub-darwin-amd64-2.11.2.tgz && tar -xvf /tmp/hub-darwin-amd64-2.11.2.tgz -C /usr/local/opt && ln -s /usr/local/opt/hub-darwin-amd64-2.11.2/bin/hub /usr/local/bin/hub
127128
# upgrade cocoapods
128-
- gem install cocoapods -v '1.6.1'
129+
- gem install cocoapods -v '1.8.0'
129130
script:
130131
- Scripts/run_release.sh

‎OptimizelySwiftSDK.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
1313
:tag => "v"+s.version.to_s
1414
}
1515
s.source_files = "Sources/**/*.swift"
16-
s.swift_version = "5.0"
16+
s.swift_version = ["5.0", "5.1"]
1717
s.framework = "Foundation"
1818
s.requires_arc = true
1919
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }

‎OptimizelySwiftSDK.xcodeproj/project.pbxproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
0B11272E2242D817002A9C20 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EBAEB6C21E3FEF800D13AA9 /* Optimizely.framework */; };
11-
0BAB9B0122567E34000DC388 /* (null) in Sources */ = {isa = PBXBuildFile; };
11+
0BAB9B0122567E34000DC388 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
1212
6E12B1CA22C55A250005E9E6 /* optimizely_6372300739_v4.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E75196222C5211100B2B157 /* optimizely_6372300739_v4.json */; };
1313
6E12B1CB22C55A250005E9E6 /* feature_rollout_toggle_on.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E75196722C5211100B2B157 /* feature_rollout_toggle_on.json */; };
1414
6E12B1CC22C55A250005E9E6 /* feature_rollout_toggle_off.json in Resources */ = {isa = PBXBuildFile; fileRef = 6E75196822C5211100B2B157 /* feature_rollout_toggle_off.json */; };
@@ -1155,8 +1155,8 @@
11551155
6EA425602218E58400B074B5 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E614DCD21E3F389005982A1 /* Optimizely.framework */; };
11561156
6EA4256F2218E60A00B074B5 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EBAEB6C21E3FEF800D13AA9 /* Optimizely.framework */; };
11571157
6EA4257E2218E61F00B074B5 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EBAEB6C21E3FEF800D13AA9 /* Optimizely.framework */; settings = {ATTRIBUTES = (Required, ); }; };
1158-
6EA425962218E6AD00B074B5 /* (null) in Sources */ = {isa = PBXBuildFile; };
1159-
6EA425A52218E6AE00B074B5 /* (null) in Sources */ = {isa = PBXBuildFile; };
1158+
6EA425962218E6AD00B074B5 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
1159+
6EA425A52218E6AE00B074B5 /* BuildFile in Sources */ = {isa = PBXBuildFile; };
11601160
6EA426602219242100B074B5 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EBAEB6C21E3FEF800D13AA9 /* Optimizely.framework */; };
11611161
6EA4266F2219243D00B074B5 /* Optimizely.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E614DCD21E3F389005982A1 /* Optimizely.framework */; };
11621162
6ECB270222C526A7005D52DC /* Optimizely.h in Headers */ = {isa = PBXBuildFile; fileRef = 6E75167A22C520D400B2B157 /* Optimizely.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2737,7 +2737,7 @@
27372737
isa = PBXSourcesBuildPhase;
27382738
buildActionMask = 2147483647;
27392739
files = (
2740-
0BAB9B0122567E34000DC388 /* (null) in Sources */,
2740+
0BAB9B0122567E34000DC388 /* BuildFile in Sources */,
27412741
6E7517D822C520D400B2B157 /* DefaultNotificationCenter.swift in Sources */,
27422742
6E75177622C520D400B2B157 /* SDKVersion.swift in Sources */,
27432743
6E7516FE22C520D400B2B157 /* OptimizelyLogLevel.swift in Sources */,
@@ -3039,7 +3039,7 @@
30393039
6E7516BC22C520D400B2B157 /* DefaultUserProfileService.swift in Sources */,
30403040
6E7517A022C520D400B2B157 /* DataStoreQueueStackImpl+Extension.swift in Sources */,
30413041
6E7517AC22C520D400B2B157 /* Array+Extension.swift in Sources */,
3042-
6EA425A52218E6AE00B074B5 /* (null) in Sources */,
3042+
6EA425A52218E6AE00B074B5 /* BuildFile in Sources */,
30433043
6E75180E22C520D400B2B157 /* DataStoreFile.swift in Sources */,
30443044
6E9B11B822C5489600C22D81 /* OTUtils.swift in Sources */,
30453045
6E9B119022C5488300C22D81 /* AttributeValueTests.swift in Sources */,
@@ -3223,7 +3223,7 @@
32233223
6E7516B722C520D400B2B157 /* DefaultUserProfileService.swift in Sources */,
32243224
6E75179B22C520D400B2B157 /* DataStoreQueueStackImpl+Extension.swift in Sources */,
32253225
6E7517A722C520D400B2B157 /* Array+Extension.swift in Sources */,
3226-
6EA425962218E6AD00B074B5 /* (null) in Sources */,
3226+
6EA425962218E6AD00B074B5 /* BuildFile in Sources */,
32273227
6E75180922C520D400B2B157 /* DataStoreFile.swift in Sources */,
32283228
6E9B11AE22C5489300C22D81 /* OTUtils.swift in Sources */,
32293229
6E9B117A22C5488100C22D81 /* AttributeValueTests.swift in Sources */,
@@ -3583,6 +3583,7 @@
35833583
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
35843584
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
35853585
CLANG_CXX_LIBRARY = "libc++";
3586+
CLANG_ENABLE_CODE_COVERAGE = YES;
35863587
CLANG_ENABLE_MODULES = YES;
35873588
CLANG_ENABLE_OBJC_ARC = YES;
35883589
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -3648,6 +3649,7 @@
36483649
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
36493650
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
36503651
CLANG_CXX_LIBRARY = "libc++";
3652+
CLANG_ENABLE_CODE_COVERAGE = YES;
36513653
CLANG_ENABLE_MODULES = YES;
36523654
CLANG_ENABLE_OBJC_ARC = YES;
36533655
CLANG_ENABLE_OBJC_WEAK = YES;

‎OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelySwiftSDK-Commons.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
codeCoverageEnabled = "YES">
1415
<Testables>
1516
<TestableReference
1617
skipped = "NO">

‎OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelySwiftSDK-DataModels.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
codeCoverageEnabled = "YES">
1415
<Testables>
1516
<TestableReference
1617
skipped = "NO">

‎OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelySwiftSDKTests-Common-tvOS.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
codeCoverageEnabled = "YES">
1415
<Testables>
1516
<TestableReference
1617
skipped = "NO">

‎OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelyTests-Commons-iOS.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
codeCoverageEnabled = "YES">
1415
<Testables>
1516
<TestableReference
1617
skipped = "NO">

‎OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelyTests-DataModel-tvOS.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
codeCoverageEnabled = "YES">
1415
<Testables>
1516
<TestableReference
1617
skipped = "NO">

‎OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelyTests-DataModels-iOS.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
codeCoverageEnabled = "YES">
1415
<Testables>
1516
<TestableReference
1617
skipped = "NO">

‎OptimizelySwiftSDK.xcodeproj/xcshareddata/xcschemes/OptimizelyTests-Others-iOS.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
shouldUseLaunchSchemeArgsEnv = "YES">
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
codeCoverageEnabled = "YES">
1415
<Testables>
1516
<TestableReference
1617
skipped = "NO">

0 commit comments

Comments
 (0)