Skip to content

Commit 4cc9139

Browse files
authored
Merge pull request #181 from optimizely/jae/v3
fix script to support in-code version management
2 parents 95a9e27 + 3635fca commit 4cc9139

File tree

3 files changed

+42
-70
lines changed

3 files changed

+42
-70
lines changed

OptimizelySDK/OptimizelySwiftSDK.xcodeproj/project.pbxproj

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -118,18 +118,18 @@
118118
0BC47BE62243012E00E5C2CD /* MurmurTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC47BE42243012E00E5C2CD /* MurmurTests.swift */; };
119119
0BC48EA32203764E003AFD71 /* DataStoreQueueStackImpl+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC48EA22203764E003AFD71 /* DataStoreQueueStackImpl+Extension.swift */; };
120120
0BC48EA522038491003AFD71 /* ArrayEventForDispatch+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC48EA422038491003AFD71 /* ArrayEventForDispatch+Extension.swift */; };
121-
0BDF9DC1228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
122-
0BDF9DC2228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
123-
0BDF9DC3228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
124-
0BDF9DC4228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
125-
0BDF9DC5228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
126-
0BDF9DC6228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
127-
0BDF9DC7228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
128-
0BDF9DC8228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
129-
0BDF9DC9228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
130-
0BDF9DCA228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
131-
0BDF9DCB228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
132-
0BDF9DCC228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */; };
121+
0BDF9DC1228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
122+
0BDF9DC2228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
123+
0BDF9DC3228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
124+
0BDF9DC4228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
125+
0BDF9DC5228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
126+
0BDF9DC6228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
127+
0BDF9DC7228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
128+
0BDF9DC8228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
129+
0BDF9DC9228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
130+
0BDF9DCA228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
131+
0BDF9DCB228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
132+
0BDF9DCC228242E500CCD8D1 /* SDKVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */; };
133133
0BE644ED223821D3009A5D1D /* AtomicProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BE644EC223821D3009A5D1D /* AtomicProperty.swift */; };
134134
0BE644EE223821D3009A5D1D /* AtomicProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BE644EC223821D3009A5D1D /* AtomicProperty.swift */; };
135135
0BE644EF223821D3009A5D1D /* AtomicProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BE644EC223821D3009A5D1D /* AtomicProperty.swift */; };
@@ -1220,7 +1220,7 @@
12201220
0BC47BE42243012E00E5C2CD /* MurmurTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MurmurTests.swift; sourceTree = "<group>"; };
12211221
0BC48EA22203764E003AFD71 /* DataStoreQueueStackImpl+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DataStoreQueueStackImpl+Extension.swift"; sourceTree = "<group>"; };
12221222
0BC48EA422038491003AFD71 /* ArrayEventForDispatch+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArrayEventForDispatch+Extension.swift"; sourceTree = "<group>"; };
1223-
0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OptimizelySDKVersion.swift; sourceTree = "<group>"; };
1223+
0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SDKVersion.swift; sourceTree = "<group>"; };
12241224
0BE644EC223821D3009A5D1D /* AtomicProperty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomicProperty.swift; sourceTree = "<group>"; };
12251225
1BB705EF16F51D6560E2516E /* Pods-OptimizelyTests-Common-tvOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OptimizelyTests-Common-tvOS.debug.xcconfig"; path = "Target Support Files/Pods-OptimizelyTests-Common-tvOS/Pods-OptimizelyTests-Common-tvOS.debug.xcconfig"; sourceTree = "<group>"; };
12261226
267A95DA08018A1800FDB35B /* Pods_OptimizelyTests_Common_tvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OptimizelyTests_Common_tvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1449,7 +1449,7 @@
14491449
0B0590172209DC180007F4A2 /* HandlerRegistryService.swift */,
14501450
0BE644EC223821D3009A5D1D /* AtomicProperty.swift */,
14511451
6EA0721A223AC72D00F447CF /* Utils.swift */,
1452-
0BDF9DC0228242E500CCD8D1 /* OptimizelySDKVersion.swift */,
1452+
0BDF9DC0228242E500CCD8D1 /* SDKVersion.swift */,
14531453
);
14541454
path = Utils;
14551455
sourceTree = "<group>";
@@ -2584,7 +2584,7 @@
25842584
6E4DD85921E5250200B0C2C7 /* OPTBucketer.swift in Sources */,
25852585
6E4DD86521E5250B00B0C2C7 /* EventForDispatch.swift in Sources */,
25862586
0B7B18862231D8B800A1F85D /* DataStoreMemory.swift in Sources */,
2587-
0BDF9DC2228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
2587+
0BDF9DC2228242E500CCD8D1 /* SDKVersion.swift in Sources */,
25882588
6E4DD84A21E524FC00B0C2C7 /* MurmurHash3.swift in Sources */,
25892589
);
25902590
runOnlyForDeploymentPostprocessing = 0;
@@ -2649,7 +2649,7 @@
26492649
6E4DD8D821E5274600B0C2C7 /* ConditionHolder.swift in Sources */,
26502650
6E4DD88821E525F600B0C2C7 /* BatchEventBuilder.swift in Sources */,
26512651
0BE644F3223821D3009A5D1D /* AtomicProperty.swift in Sources */,
2652-
0BDF9DC9228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
2652+
0BDF9DC9228242E500CCD8D1 /* SDKVersion.swift in Sources */,
26532653
6E4DD89521E525FD00B0C2C7 /* DefaultUserProfileService.swift in Sources */,
26542654
6E6D66862238132300E04486 /* tvOSOnlyTests.swift in Sources */,
26552655
);
@@ -2704,7 +2704,7 @@
27042704
6E636BE12236C9B700AF3CEF /* ConditionHolder.swift in Sources */,
27052705
6E636BC52236C99D00AF3CEF /* DefaultNotificationCenter.swift in Sources */,
27062706
6E636BBB2236C99300AF3CEF /* DataStoreQueueStackImpl.swift in Sources */,
2707-
0BDF9DC5228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
2707+
0BDF9DC5228242E500CCD8D1 /* SDKVersion.swift in Sources */,
27082708
6E636BE32236C9B700AF3CEF /* UserAttribute.swift in Sources */,
27092709
6E636BB52236C98A00AF3CEF /* OPTEventDispatcher.swift in Sources */,
27102710
6E636BA62236C97E00AF3CEF /* OptimizelyClient.swift in Sources */,
@@ -2790,7 +2790,7 @@
27902790
6E636C102236C9CB00AF3CEF /* MurmurHash3.swift in Sources */,
27912791
6E636BB12236C98400AF3CEF /* DefaultLogger.swift in Sources */,
27922792
6E636BD52236C9A900AF3CEF /* OPTDecisionService.swift in Sources */,
2793-
0BDF9DC8228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
2793+
0BDF9DC8228242E500CCD8D1 /* SDKVersion.swift in Sources */,
27942794
6E636BF92236C9BD00AF3CEF /* Rollout.swift in Sources */,
27952795
6E636C132236C9CB00AF3CEF /* HandlerRegistryService.swift in Sources */,
27962796
);
@@ -2843,8 +2843,8 @@
28432843
6EA425372218E4A300B074B5 /* OPTDatafileHandler.swift in Sources */,
28442844
6EA425512218E4A300B074B5 /* ArrayEventForDispatch+Extension.swift in Sources */,
28452845
0BC47BE62243012E00E5C2CD /* MurmurTests.swift in Sources */,
2846+
0BDF9DCA228242E500CCD8D1 /* SDKVersion.swift in Sources */,
28462847
0B104B04228E194700BE87A8 /* BatchEventBuilderTests_Attributes.swift in Sources */,
2847-
0BDF9DCA228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
28482848
0BC47BD72242F7EF00E5C2CD /* DatafileHandlerTests.swift in Sources */,
28492849
6EA4252D2218E4A300B074B5 /* DataStoreQueueStackImpl.swift in Sources */,
28502850
6EA425382218E4A300B074B5 /* OPTNotificationCenter.swift in Sources */,
@@ -2925,7 +2925,7 @@
29252925
6EA425A12218E6AE00B074B5 /* AttributeValueTests.swift in Sources */,
29262926
6EA4259E2218E6AE00B074B5 /* ConditionHolderTests_Evaluate.swift in Sources */,
29272927
6EA4261E2218E74F00B074B5 /* OPTUserProfileService.swift in Sources */,
2928-
0BDF9DCB228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
2928+
0BDF9DCB228242E500CCD8D1 /* SDKVersion.swift in Sources */,
29292929
6EA4261F2218E74F00B074B5 /* DataStoreUserDefaults.swift in Sources */,
29302930
6EA4262E2218E74F00B074B5 /* OPTDataStore.swift in Sources */,
29312931
6EA425A02218E6AE00B074B5 /* RolloutTests.swift in Sources */,
@@ -3024,7 +3024,7 @@
30243024
6EA425DB2218E74D00B074B5 /* DataStoreQueueStackImpl+Extension.swift in Sources */,
30253025
6EA425D82218E74D00B074B5 /* Rollout.swift in Sources */,
30263026
6E8CB5A0224BF4BE00B8CB7A /* DecisionServiceTests_Others.swift in Sources */,
3027-
0BDF9DC4228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
3027+
0BDF9DC4228242E500CCD8D1 /* SDKVersion.swift in Sources */,
30283028
6EA425B02218E74D00B074B5 /* OptimizelyLogLevel.swift in Sources */,
30293029
6EA425DD2218E74D00B074B5 /* MurmurHash3.swift in Sources */,
30303030
6EA425CF2218E74D00B074B5 /* Project.swift in Sources */,
@@ -3100,7 +3100,7 @@
31003100
6EA425922218E6AD00B074B5 /* AttributeValueTests.swift in Sources */,
31013101
6EA4258F2218E6AD00B074B5 /* ConditionHolderTests_Evaluate.swift in Sources */,
31023102
6EA425EA2218E74E00B074B5 /* OPTUserProfileService.swift in Sources */,
3103-
0BDF9DC6228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
3103+
0BDF9DC6228242E500CCD8D1 /* SDKVersion.swift in Sources */,
31043104
6EA425EB2218E74E00B074B5 /* DataStoreUserDefaults.swift in Sources */,
31053105
6EA425FA2218E74E00B074B5 /* OPTDataStore.swift in Sources */,
31063106
6EA425912218E6AD00B074B5 /* RolloutTests.swift in Sources */,
@@ -3163,7 +3163,7 @@
31633163
6EA426AE221925BB00B074B5 /* OPTDatafileHandler.swift in Sources */,
31643164
6EA426E02219266600B074B5 /* ThrowableConditionListTest.swift in Sources */,
31653165
6EA4268A221925B100B074B5 /* UserAttribute.swift in Sources */,
3166-
0BDF9DC7228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
3166+
0BDF9DC7228242E500CCD8D1 /* SDKVersion.swift in Sources */,
31673167
6EA426D2221925DE00B074B5 /* OPTLogger.swift in Sources */,
31683168
6EA426BE221925CD00B074B5 /* BatchEventBuilder.swift in Sources */,
31693169
6EA42690221925B100B074B5 /* FeatureVariable.swift in Sources */,
@@ -3231,7 +3231,7 @@
32313231
6EA426B6221925BC00B074B5 /* OPTDatafileHandler.swift in Sources */,
32323232
6EA426E12219266600B074B5 /* ThrowableConditionListTest.swift in Sources */,
32333233
6EA4269D221925B300B074B5 /* UserAttribute.swift in Sources */,
3234-
0BDF9DCC228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
3234+
0BDF9DCC228242E500CCD8D1 /* SDKVersion.swift in Sources */,
32353235
6EA426DC221925DF00B074B5 /* OPTLogger.swift in Sources */,
32363236
6EA426C6221925CE00B074B5 /* BatchEventBuilder.swift in Sources */,
32373237
6EA426A3221925B300B074B5 /* FeatureVariable.swift in Sources */,
@@ -3290,7 +3290,7 @@
32903290
6E4DD87321E5251700B0C2C7 /* FeatureFlag.swift in Sources */,
32913291
6E4DD85121E5250200B0C2C7 /* OPTEventDispatcher.swift in Sources */,
32923292
0B7B18852231D8B800A1F85D /* DataStoreMemory.swift in Sources */,
3293-
0BDF9DC1228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
3293+
0BDF9DC1228242E500CCD8D1 /* SDKVersion.swift in Sources */,
32943294
6EA4264F22191EEC00B074B5 /* Array+Extension.swift in Sources */,
32953295
6E4F0D972213A4EF00DD13A5 /* Project.swift in Sources */,
32963296
6E4DD87621E5251700B0C2C7 /* Group.swift in Sources */,
@@ -3406,7 +3406,7 @@
34063406
6E4DD89021E525FC00B0C2C7 /* DefaultDatafileHandler.swift in Sources */,
34073407
0B05901A2209DC180007F4A2 /* HandlerRegistryService.swift in Sources */,
34083408
0B7B9EA721F2823500056589 /* OPTDataStore.swift in Sources */,
3409-
0BDF9DC3228242E500CCD8D1 /* OptimizelySDKVersion.swift in Sources */,
3409+
0BDF9DC3228242E500CCD8D1 /* SDKVersion.swift in Sources */,
34103410
0BE644EF223821D3009A5D1D /* AtomicProperty.swift in Sources */,
34113411
6E4DD89D21E5260100B0C2C7 /* Constants.swift in Sources */,
34123412
);
@@ -3502,7 +3502,7 @@
35023502
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
35033503
CODE_SIGN_IDENTITY = "iPhone Developer";
35043504
COPY_PHASE_STRIP = NO;
3505-
CURRENT_PROJECT_VERSION = "$(OPTIMIZELY_SDK_VERSION)";
3505+
CURRENT_PROJECT_VERSION = 1;
35063506
DEBUG_INFORMATION_FORMAT = dwarf;
35073507
ENABLE_STRICT_OBJC_MSGSEND = YES;
35083508
ENABLE_TESTABILITY = YES;
@@ -3524,11 +3524,6 @@
35243524
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
35253525
MTL_FAST_MATH = YES;
35263526
ONLY_ACTIVE_ARCH = YES;
3527-
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
3528-
OPTIMIZELY_SDK_VERSION_MAJOR = 3;
3529-
OPTIMIZELY_SDK_VERSION_MINOR = 1;
3530-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
3531-
OPTIMIZELY_SDK_VERSION_SUFFIX = "-beta";
35323527
SDKROOT = iphoneos;
35333528
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
35343529
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -3571,7 +3566,7 @@
35713566
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
35723567
CODE_SIGN_IDENTITY = "iPhone Developer";
35733568
COPY_PHASE_STRIP = NO;
3574-
CURRENT_PROJECT_VERSION = "$(OPTIMIZELY_SDK_VERSION)";
3569+
CURRENT_PROJECT_VERSION = 1;
35753570
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
35763571
ENABLE_NS_ASSERTIONS = NO;
35773572
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -3587,11 +3582,6 @@
35873582
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
35883583
MTL_ENABLE_DEBUG_INFO = NO;
35893584
MTL_FAST_MATH = YES;
3590-
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
3591-
OPTIMIZELY_SDK_VERSION_MAJOR = 3;
3592-
OPTIMIZELY_SDK_VERSION_MINOR = 1;
3593-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
3594-
OPTIMIZELY_SDK_VERSION_SUFFIX = "-beta";
35953585
SDKROOT = iphoneos;
35963586
SWIFT_COMPILATION_MODE = wholemodule;
35973587
SWIFT_OPTIMIZATION_LEVEL = "-O";

OptimizelySDK/Utils/OptimizelySDKVersion.swift renamed to OptimizelySDK/Utils/SDKVersion.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
* limitations under the License. *
1616
***************************************************************************/
1717

18-
/// Do not edit this field. It is auto updated to reflect the current version using the runtimeVersion script.
19-
let OPTIMIZELY_SDK_VERSION = "1.0.0"
18+
/// Do not edit this field.
19+
/// It is auto updated (Scripts/updated_version.sh) to reflect the current version
20+
let OPTIMIZELY_SDK_VERSION = "3.1.0-beta"

Scripts/update_version.sh

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# update_version.sh
44
#
55
# This script consistently updates the SDK version numbers in several places:
6-
# 1. {XcodeProject}/{XcodeProject}.xcodeproj/project.pbxproj
6+
# 1. {XcodeProject}/OptimizelySDK/Utils/SDKVersion.swift
77
# 2. {XcodeProject}.podspec
88
#
99
# Usage:
@@ -28,44 +28,25 @@ if (( ${#varComps[@]} != 3 )); then
2828
exit 1
2929
fi
3030

31-
vMajor=${varComps[0]}
32-
vMinor=${varComps[1]}
33-
vPatch=${varComps[2]}
34-
vSuffix=""
35-
36-
if [[ $vPatch =~ ^([0-9]+)([^0-9]*)$ ]] ; then
37-
vPatch=${BASH_REMATCH[1]}
38-
vSuffix=${BASH_REMATCH[2]}
39-
fi
40-
41-
printf "\nRelease SDK Version: ${vMajor}.${vMinor}.${vPatch}${vSuffix} \n"
42-
4331
cd "$(dirname $0)/.."
4432

4533
#----------------------------------------------------------------------------------
46-
# 1. update the SDK version in all xcode project settings
34+
# 1. update the SDK version in SDKVersion.swift file
4735
#----------------------------------------------------------------------------------
48-
printf "\n\nReplacing OPTIMIZELY_SDK_VERSION in Xcode Build Settings to the target version.\n"
49-
50-
curPbxProjPath="OptimizelySDK/OptimizelySwiftSDK.xcodeproj/project.pbxproj"
51-
printf "\t[Updating .pbxproj to ${releaseSDKVersion}.\n"
52-
53-
sed -i '' -e "s/\(OPTIMIZELY_SDK_VERSION_MAJOR[ ]*\)=.*;/\1= \"${vMajor}\";/g" ${curPbxProjPath}
54-
sed -i '' -e "s/\(OPTIMIZELY_SDK_VERSION_MINOR[ ]*\)=.*;/\1= \"${vMinor}\";/g" ${curPbxProjPath}
55-
sed -i '' -e "s/\(OPTIMIZELY_SDK_VERSION_PATCH[ ]*\)=.*;/\1= \"${vPatch}\";/g" ${curPbxProjPath}
56-
sed -i '' -e "s/\(OPTIMIZELY_SDK_VERSION_SUFFIX[ ]*\)=.*;/\1= \"${vSuffix}\";/g" ${curPbxProjPath}
57-
58-
printf "Verifying OPTIMIZELY_SDK_VERSION from Xcode Build Settings.\n";
36+
sdkVersionFilepath="OptimizelySDK/Utils/SDKVersion.swift"
37+
sdkVersionKey="OPTIMIZELY_SDK_VERSION"
5938

60-
curProjPath="OptimizelySDK/OptimizelySwiftSDK.xcodeproj"
39+
printf "\tUpdating ${sdkVersionKey} to ${releaseSDKVersion}.\n"
40+
sed -i '' -e "s/${sdkVersionKey}[ ]*=.*\"\(.*\)\"/${sdkVersionKey} = \"${releaseSDKVersion}\"/g" ${sdkVersionFilepath}
6141

62-
OPTIMIZELY_SDK_VERSION=$(Xcodebuild -project ${curProjPath} -showBuildSettings | sed -n 's/OPTIMIZELY_SDK_VERSION = \(.*\)/\1/p' | sed 's/ //g');
42+
printf "Verifying ${sdkVersionKey} from ${sdkVersionFilepath}\n";
43+
verifySdkVersion=$(sed -n "s/.*${sdkVersionKey} = \"\(.*\)\".*/\1/p" ${sdkVersionFilepath})
6344

64-
if [ "${OPTIMIZELY_SDK_VERSION}" == "${releaseSDKVersion}" ]
45+
if [ "${verifySdkVersion}" == "${releaseSDKVersion}" ]
6546
then
66-
printf "\t[OPTIMIZELY_SDK_VERSION in xcode settings verified: ${releaseSDKVersion} === ${OPTIMIZELY_SDK_VERSION}\n"
47+
printf "\tSDKVersion.swift file verified: ${releaseSDKVersion} === ${verifySdkVersion}\n"
6748
else
68-
printf "\n[ERROR][${curMod}] OPTIMIZELY_SDK_VERSION mismatch: (releaseSDKVersion/OPTIMIZELY_SDK_VERSION) = ${releaseSDKVersion}/${OPTIMIZELY_SDK_VERSION}\n";
49+
printf "\n[ERROR] SDKVersion.swift file has an error: [${verifySdkVersion}]";
6950
exit 1
7051
fi
7152

0 commit comments

Comments
 (0)