Skip to content

Commit 82cc544

Browse files
kellyroach-optimizelykellyroach-optimizely
authored
Resolve conflicts (generated-frameworks) (#248)
1 parent 2778e55 commit 82cc544

File tree

22 files changed

+39
-33
lines changed

22 files changed

+39
-33
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
# Optimizely Objective-C SDK Changelog
2+
## 2.0.1
3+
May 9, 2018
4+
5+
### New Features
6+
* Adding mobile 2.x data file CDN url change to support FullStack projects without Feature Management V2 schema.
7+
28
## 2.0.0
39
April 23, 2018
410

‎OptimizelySDKCore.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OptimizelySDKCore"
3-
s.version = "2.0.0"
3+
s.version = "2.0.1"
44
s.summary = "Optimizely server-side testing core framework."
55
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
66
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }

‎OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,7 +2184,7 @@
21842184
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
21852185
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
21862186
OPTIMIZELY_SDK_VERSION_MINOR = 0;
2187-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
2187+
OPTIMIZELY_SDK_VERSION_PATCH = 1;
21882188
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
21892189
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME)";
21902190
SDKROOT = iphoneos;
@@ -2461,7 +2461,7 @@
24612461
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
24622462
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
24632463
OPTIMIZELY_SDK_VERSION_MINOR = 0;
2464-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
2464+
OPTIMIZELY_SDK_VERSION_PATCH = 1;
24652465
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
24662466
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME)";
24672467
SDKROOT = iphoneos;

‎OptimizelySDKDatafileManager.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OptimizelySDKDatafileManager"
3-
s.version = "2.0.0"
3+
s.version = "2.0.1"
44
s.summary = "Optimizely server-side testing datafile manager framework."
55
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
66
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
1616
s.framework = "Foundation"
1717
s.requires_arc = true
1818
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }
19-
s.dependency 'OptimizelySDKShared', '2.0.0'
19+
s.dependency 'OptimizelySDKShared', '2.0.1'
2020
end

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@
833833
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
834834
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
835835
OPTIMIZELY_SDK_VERSION_MINOR = 0;
836-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
836+
OPTIMIZELY_SDK_VERSION_PATCH = 1;
837837
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
838838
SDKROOT = iphoneos;
839839
TARGETED_DEVICE_FAMILY = "1,2";
@@ -901,7 +901,7 @@
901901
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
902902
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
903903
OPTIMIZELY_SDK_VERSION_MINOR = 0;
904-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
904+
OPTIMIZELY_SDK_VERSION_PATCH = 1;
905905
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
906906
SDKROOT = iphoneos;
907907
TARGETED_DEVICE_FAMILY = "1,2";

‎OptimizelySDKEventDispatcher.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OptimizelySDKEventDispatcher"
3-
s.version = "2.0.0"
3+
s.version = "2.0.1"
44
s.summary = "Optimizely server-side testing event dispatcher framework."
55
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
66
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
1616
s.framework = "Foundation"
1717
s.requires_arc = true
1818
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }
19-
s.dependency 'OptimizelySDKShared', '2.0.0'
19+
s.dependency 'OptimizelySDKShared', '2.0.1'
2020
end

‎OptimizelySDKEventDispatcher/OptimizelySDKEventDispatcher.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@
709709
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
710710
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
711711
OPTIMIZELY_SDK_VERSION_MINOR = 0;
712-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
712+
OPTIMIZELY_SDK_VERSION_PATCH = 1;
713713
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
714714
SDKROOT = iphoneos;
715715
TARGETED_DEVICE_FAMILY = "1,2";
@@ -779,7 +779,7 @@
779779
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
780780
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
781781
OPTIMIZELY_SDK_VERSION_MINOR = 0;
782-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
782+
OPTIMIZELY_SDK_VERSION_PATCH = 1;
783783
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
784784
SDKROOT = iphoneos;
785785
TARGETED_DEVICE_FAMILY = "1,2";

‎OptimizelySDKShared.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OptimizelySDKShared"
3-
s.version = "2.0.0"
3+
s.version = "2.0.1"
44
s.summary = "Optimizely server-side testing shared framework."
55
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
66
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
1818
s.ios.library = "sqlite3"
1919
s.requires_arc = true
2020
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }
21-
s.dependency 'OptimizelySDKCore', '2.0.0'
21+
s.dependency 'OptimizelySDKCore', '2.0.1'
2222
end

‎OptimizelySDKShared/OptimizelySDKShared.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@
11301130
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
11311131
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
11321132
OPTIMIZELY_SDK_VERSION_MINOR = 0;
1133-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
1133+
OPTIMIZELY_SDK_VERSION_PATCH = 1;
11341134
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
11351135
SDKROOT = iphoneos;
11361136
TARGETED_DEVICE_FAMILY = "1,2";
@@ -1200,7 +1200,7 @@
12001200
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
12011201
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
12021202
OPTIMIZELY_SDK_VERSION_MINOR = 0;
1203-
OPTIMIZELY_SDK_VERSION_PATCH = 0;
1203+
OPTIMIZELY_SDK_VERSION_PATCH = 1;
12041204
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
12051205
SDKROOT = iphoneos;
12061206
TARGETED_DEVICE_FAMILY = "1,2";

‎OptimizelySDKTVOS.podspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "OptimizelySDKTVOS"
3-
s.version = "2.0.0"
3+
s.version = "2.0.1"
44
s.summary = "Optimizely server-side testing framework for tvOS."
55
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
66
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
s.framework = "Foundation"
1717
s.requires_arc = true
1818
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }
19-
s.dependency 'OptimizelySDKEventDispatcher', '2.0.0'
20-
s.dependency 'OptimizelySDKUserProfileService', '2.0.0'
21-
s.dependency 'OptimizelySDKDatafileManager', '2.0.0'
19+
s.dependency 'OptimizelySDKEventDispatcher', '2.0.1'
20+
s.dependency 'OptimizelySDKUserProfileService', '2.0.1'
21+
s.dependency 'OptimizelySDKDatafileManager', '2.0.1'
2222
end

0 commit comments

Comments
 (0)