Skip to content

Commit ce6676c

Browse files
thomaszurkan-optimizelythomaszurkan-optimizely
authored
update for 2.1.2 release (#324)
* update for 2.1.2 release * cleanup erroneous VERSION_PATCH additions, fix compiler warnings, make EventTagsUtil a package level class (not public). * remove warning due to our code * update changelog * just update for compile warnings. don't upgrade to xcode 10 * supress warning * Revert "update changelog" This reverts commit ba70448. * revert upgrade to xcode 10 settings because travis is complaining * revert from upgrade to 10 * try and get xcode to pass travis build * suppress warning using pragma without macro. travis complains * try one more time to use pragma to remove a warning * had to remove pragma in order to get travis to pass * finally get rid of compiler warning. * I hate travis-ci
1 parent f2ada9c commit ce6676c

File tree

32 files changed

+79
-105
lines changed

32 files changed

+79
-105
lines changed

‎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.1.1"
3+
s.version = "2.1.2"
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,8 @@
217217
5E4C07FC1DFF66B00042B1F8 /* OPTLYNetworkServiceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E4C07FA1DFF66B00042B1F8 /* OPTLYNetworkServiceTest.m */; };
218218
5ECBBE681DDE6A800028FF6B /* OPTLYVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ECBBE661DDE6A800028FF6B /* OPTLYVariable.h */; settings = {ATTRIBUTES = (Public, ); }; };
219219
5ECBBE691DDE6A800028FF6B /* OPTLYVariable.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ECBBE671DDE6A800028FF6B /* OPTLYVariable.m */; };
220-
9084F7812150D4F700ACBA99 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9084F77F2150D4F700ACBA99 /* OPTLYEventTagUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
221-
9084F7822150D4F800ACBA99 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9084F77F2150D4F700ACBA99 /* OPTLYEventTagUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
220+
9084F7812150D4F700ACBA99 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9084F77F2150D4F700ACBA99 /* OPTLYEventTagUtil.h */; };
221+
9084F7822150D4F800ACBA99 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9084F77F2150D4F700ACBA99 /* OPTLYEventTagUtil.h */; };
222222
9084F7832150D4F800ACBA99 /* OPTLYEventTagUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 9084F7802150D4F700ACBA99 /* OPTLYEventTagUtil.m */; };
223223
9084F7842150D4F800ACBA99 /* OPTLYEventTagUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 9084F7802150D4F700ACBA99 /* OPTLYEventTagUtil.m */; };
224224
90855D0020ED254500A97BEC /* OPTLYControlAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 90855CFC20ED237F00A97BEC /* OPTLYControlAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -2240,7 +2240,7 @@
22402240
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
22412241
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
22422242
OPTIMIZELY_SDK_VERSION_MINOR = 1;
2243-
OPTIMIZELY_SDK_VERSION_PATCH = 1;
2243+
OPTIMIZELY_SDK_VERSION_PATCH = 2;
22442244
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
22452245
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME)";
22462246
SDKROOT = iphoneos;
@@ -2530,7 +2530,7 @@
25302530
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
25312531
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
25322532
OPTIMIZELY_SDK_VERSION_MINOR = 1;
2533-
OPTIMIZELY_SDK_VERSION_PATCH = 1;
2533+
OPTIMIZELY_SDK_VERSION_PATCH = 2;
25342534
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
25352535
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME)";
25362536
SDKROOT = iphoneos;

‎OptimizelySDKCore/OptimizelySDKCore/OPTLYEventBuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_END
6565
@interface OPTLYEventBuilderDefault : NSObject<OPTLYEventBuilder>
6666

6767
/// init is disabled. Please use initWithConfig to create an Event Builder
68-
- (instancetype)init NS_UNAVAILABLE;
68+
- (nonnull instancetype)init NS_UNAVAILABLE;
6969

7070
/**
7171
* Initialize the default event build with the project config.

‎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.1.1"
3+
s.version = "2.1.2"
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.1.1'
19+
s.dependency 'OptimizelySDKShared', '2.1.2'
2020
end

‎OptimizelySDKDatafileManager/OptimizelySDKDatafileManager.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,7 @@
815815
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
816816
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
817817
OPTIMIZELY_SDK_VERSION_MINOR = 1;
818-
OPTIMIZELY_SDK_VERSION_PATCH = 1;
818+
OPTIMIZELY_SDK_VERSION_PATCH = 2;
819819
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
820820
SDKROOT = iphoneos;
821821
SWIFT_VERSION = 4.2;
@@ -886,7 +886,7 @@
886886
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
887887
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
888888
OPTIMIZELY_SDK_VERSION_MINOR = 1;
889-
OPTIMIZELY_SDK_VERSION_PATCH = 1;
889+
OPTIMIZELY_SDK_VERSION_PATCH = 2;
890890
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
891891
SDKROOT = iphoneos;
892892
SWIFT_VERSION = 4.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.1.1"
3+
s.version = "2.1.2"
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.1.1'
19+
s.dependency 'OptimizelySDKShared', '2.1.2'
2020
end

‎OptimizelySDKEventDispatcher/OptimizelySDKEventDispatcher.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@
687687
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
688688
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
689689
OPTIMIZELY_SDK_VERSION_MINOR = 1;
690-
OPTIMIZELY_SDK_VERSION_PATCH = 1;
690+
OPTIMIZELY_SDK_VERSION_PATCH = 2;
691691
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
692692
SDKROOT = iphoneos;
693693
SWIFT_VERSION = 4.2;
@@ -760,7 +760,7 @@
760760
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
761761
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
762762
OPTIMIZELY_SDK_VERSION_MINOR = 1;
763-
OPTIMIZELY_SDK_VERSION_PATCH = 1;
763+
OPTIMIZELY_SDK_VERSION_PATCH = 2;
764764
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
765765
SDKROOT = iphoneos;
766766
SWIFT_VERSION = 4.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.1.1"
3+
s.version = "2.1.2"
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.1.1'
21+
s.dependency 'OptimizelySDKCore', '2.1.2'
2222
end

‎OptimizelySDKShared/OPTLYFMDB/src/optlyfmdb/OPTLYFMDBDatabase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ typedef int(^OPTLYFMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDicti
526526
527527
*/
528528

529-
- (BOOL)executeStatements:(NSString *)sql withResultBlock:(__attribute__((noescape)) OPTLYFMDBExecuteStatementsCallbackBlock _Nullable)block;
529+
- (BOOL)executeStatements:(__attribute__((noescape)) NSString *)sql withResultBlock:(__attribute__((noescape)) OPTLYFMDBExecuteStatementsCallbackBlock _Nullable)block;
530530

531531
/** Last insert rowid
532532

‎OptimizelySDKShared/OPTLYFMDB/src/optlyfmdb/OPTLYFMDBDatabase.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ - (BOOL)executeStatements:(NSString *)sql {
12681268
return [self executeStatements:sql withResultBlock:nil];
12691269
}
12701270

1271-
- (BOOL)executeStatements:(NSString *)sql withResultBlock:(OPTLYFMDBExecuteStatementsCallbackBlock)block {
1271+
- (BOOL)executeStatements:(__attribute__((noescape)) NSString *)sql withResultBlock:(__attribute__((noescape)) OPTLYFMDBExecuteStatementsCallbackBlock)block {
12721272

12731273
int rc;
12741274
char *errmsg = nil;
@@ -1410,7 +1410,7 @@ - (BOOL)rollbackToSavePointWithName:(NSString*)name error:(NSError**)outErr {
14101410
#endif
14111411
}
14121412

1413-
- (NSError*)inSavePoint:(void (^)(BOOL *rollback))block {
1413+
- (NSError*)inSavePoint:(__attribute__((noescape)) void (^)(BOOL *rollback))block {
14141414
#if SQLITE_VERSION_NUMBER >= 3007000
14151415
static unsigned long savePointIdx = 0;
14161416

0 commit comments

Comments
 (0)