Skip to content

Commit

Permalink
update for 2.1.2 release (#324)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
thomaszurkan-optimizely authored Oct 2, 2018
1 parent f2ada9c commit ce6676c
Show file tree
Hide file tree
Showing 32 changed files with 79 additions and 105 deletions.
2 changes: 1 addition & 1 deletion OptimizelySDKCore.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "OptimizelySDKCore"
s.version = "2.1.1"
s.version = "2.1.2"
s.summary = "Optimizely server-side testing core framework."
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
Expand Down
8 changes: 4 additions & 4 deletions OptimizelySDKCore/OptimizelySDKCore.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@
5E4C07FC1DFF66B00042B1F8 /* OPTLYNetworkServiceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5E4C07FA1DFF66B00042B1F8 /* OPTLYNetworkServiceTest.m */; };
5ECBBE681DDE6A800028FF6B /* OPTLYVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ECBBE661DDE6A800028FF6B /* OPTLYVariable.h */; settings = {ATTRIBUTES = (Public, ); }; };
5ECBBE691DDE6A800028FF6B /* OPTLYVariable.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ECBBE671DDE6A800028FF6B /* OPTLYVariable.m */; };
9084F7812150D4F700ACBA99 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9084F77F2150D4F700ACBA99 /* OPTLYEventTagUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
9084F7822150D4F800ACBA99 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9084F77F2150D4F700ACBA99 /* OPTLYEventTagUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
9084F7812150D4F700ACBA99 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9084F77F2150D4F700ACBA99 /* OPTLYEventTagUtil.h */; };
9084F7822150D4F800ACBA99 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 9084F77F2150D4F700ACBA99 /* OPTLYEventTagUtil.h */; };
9084F7832150D4F800ACBA99 /* OPTLYEventTagUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 9084F7802150D4F700ACBA99 /* OPTLYEventTagUtil.m */; };
9084F7842150D4F800ACBA99 /* OPTLYEventTagUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 9084F7802150D4F700ACBA99 /* OPTLYEventTagUtil.m */; };
90855D0020ED254500A97BEC /* OPTLYControlAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 90855CFC20ED237F00A97BEC /* OPTLYControlAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -2240,7 +2240,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME)";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -2530,7 +2530,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME)";
SDKROOT = iphoneos;
Expand Down
2 changes: 1 addition & 1 deletion OptimizelySDKCore/OptimizelySDKCore/OPTLYEventBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_END
@interface OPTLYEventBuilderDefault : NSObject<OPTLYEventBuilder>

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

/**
* Initialize the default event build with the project config.
Expand Down
4 changes: 2 additions & 2 deletions OptimizelySDKDatafileManager.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "OptimizelySDKDatafileManager"
s.version = "2.1.1"
s.version = "2.1.2"
s.summary = "Optimizely server-side testing datafile manager framework."
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
Expand All @@ -16,5 +16,5 @@ Pod::Spec.new do |s|
s.framework = "Foundation"
s.requires_arc = true
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }
s.dependency 'OptimizelySDKShared', '2.1.1'
s.dependency 'OptimizelySDKShared', '2.1.2'
end
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.2;
Expand Down Expand Up @@ -886,7 +886,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.2;
Expand Down
4 changes: 2 additions & 2 deletions OptimizelySDKEventDispatcher.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "OptimizelySDKEventDispatcher"
s.version = "2.1.1"
s.version = "2.1.2"
s.summary = "Optimizely server-side testing event dispatcher framework."
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
Expand All @@ -16,5 +16,5 @@ Pod::Spec.new do |s|
s.framework = "Foundation"
s.requires_arc = true
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }
s.dependency 'OptimizelySDKShared', '2.1.1'
s.dependency 'OptimizelySDKShared', '2.1.2'
end
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.2;
Expand Down Expand Up @@ -760,7 +760,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.2;
Expand Down
4 changes: 2 additions & 2 deletions OptimizelySDKShared.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "OptimizelySDKShared"
s.version = "2.1.1"
s.version = "2.1.2"
s.summary = "Optimizely server-side testing shared framework."
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
Expand All @@ -18,5 +18,5 @@ Pod::Spec.new do |s|
s.ios.library = "sqlite3"
s.requires_arc = true
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }
s.dependency 'OptimizelySDKCore', '2.1.1'
s.dependency 'OptimizelySDKCore', '2.1.2'
end
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ typedef int(^OPTLYFMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDicti
*/

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

/** Last insert rowid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@ - (BOOL)executeStatements:(NSString *)sql {
return [self executeStatements:sql withResultBlock:nil];
}

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

int rc;
char *errmsg = nil;
Expand Down Expand Up @@ -1410,7 +1410,7 @@ - (BOOL)rollbackToSavePointWithName:(NSString*)name error:(NSError**)outErr {
#endif
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ - (OPTLYFMDBDatabase*)database {
return _db;
}

- (void)inDatabase:(void (^)(OPTLYFMDBDatabase *db))block {
- (void)inDatabase:(__attribute__((noescape)) void (^)(OPTLYFMDBDatabase *db))block {
#ifndef NDEBUG
/* Get the currently executing queue (which should probably be nil, but in theory could be another DB queue
* and then check it against self to make sure we're not about to deadlock. */
Expand Down Expand Up @@ -243,15 +243,15 @@ - (void)beginTransaction:(BOOL)useDeferred withBlock:(void (^)(OPTLYFMDBDatabase
OPTLYFMDBRelease(self);
}

- (void)inDeferredTransaction:(void (^)(OPTLYFMDBDatabase *db, BOOL *rollback))block {
- (void)inDeferredTransaction:(__attribute__((noescape)) void (^)(OPTLYFMDBDatabase *db, BOOL *rollback))block {
[self beginTransaction:YES withBlock:block];
}

- (void)inTransaction:(void (^)(OPTLYFMDBDatabase *db, BOOL *rollback))block {
- (void)inTransaction:(__attribute__((noescape)) void (^)(OPTLYFMDBDatabase *db, BOOL *rollback))block {
[self beginTransaction:NO withBlock:block];
}

- (NSError*)inSavePoint:(void (^)(OPTLYFMDBDatabase *db, BOOL *rollback))block {
- (NSError*)inSavePoint:(__attribute__((noescape)) void (^)(OPTLYFMDBDatabase *db, BOOL *rollback))block {
#if SQLITE_VERSION_NUMBER >= 3007000
static unsigned long savePointIdx = 0;
__block NSError *err = 0x00;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.2;
Expand Down Expand Up @@ -1203,7 +1203,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
SDKROOT = iphoneos;
SWIFT_VERSION = 4.2;
Expand Down
11 changes: 8 additions & 3 deletions OptimizelySDKShared/OptimizelySDKShared/OPTLYManagerBase.m
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,26 @@ @implementation OPTLYManagerBase
- (void)cleanUserProfileService:(NSArray<OPTLYExperiment> *)experiments {
if (experiments == nil) return;

if (_userProfileService != nil && [(NSObject *)_userProfileService respondsToSelector:@selector(removeInvalidExperimentsForAllUsers:)]) {
SEL selector = NSSelectorFromString(@"removeInvalidExperimentsForAllUsers:");

if (_userProfileService != nil && [(NSObject *)_userProfileService respondsToSelector:selector]) {
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
if (self.userProfileService != nil) {
NSMutableArray<NSString*> *ids = [[NSMutableArray alloc] initWithCapacity:experiments.count];
for (int i = 0; i < experiments.count; i++) {
NSString *exKey = ((OPTLYExperiment *)experiments[i]).experimentId;
[ids addObject:exKey];
}

// can't suppress the warning because travis-ci keeps complaining.
//#pragma clang diagnostic push
//#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
@try {
[(NSObject *)self.userProfileService performSelector:@selector(removeInvalidExperimentsForAllUsers:) withObject:ids];
[(NSObject *)self.userProfileService performSelector:selector withObject:ids];
}
@catch(NSException *e) {
[self.logger logMessage:@"Error cleaning up user profile service" withLevel:OptimizelyLogLevelError];
}
//#pragma clang diagnostic pop
}
});
}
Expand Down
8 changes: 4 additions & 4 deletions OptimizelySDKTVOS.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "OptimizelySDKTVOS"
s.version = "2.1.1"
s.version = "2.1.2"
s.summary = "Optimizely server-side testing framework for tvOS."
s.homepage = "http://developers.optimizely.com/server/reference/index.html?language=objectivec"
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
Expand All @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
s.framework = "Foundation"
s.requires_arc = true
s.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => "OPTIMIZELY_SDK_VERSION=@\\\"#{s.version}\\\"" }
s.dependency 'OptimizelySDKEventDispatcher', '2.1.1'
s.dependency 'OptimizelySDKUserProfileService', '2.1.1'
s.dependency 'OptimizelySDKDatafileManager', '2.1.1'
s.dependency 'OptimizelySDKEventDispatcher', '2.1.2'
s.dependency 'OptimizelySDKUserProfileService', '2.1.2'
s.dependency 'OptimizelySDKDatafileManager', '2.1.2'
end
4 changes: 2 additions & 2 deletions OptimizelySDKTVOS/OptimizelySDKTVOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
SDKROOT = appletvos;
SWIFT_VERSION = 4.2;
Expand Down Expand Up @@ -773,7 +773,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
SDKROOT = appletvos;
SWIFT_VERSION = 4.2;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
/* Begin PBXBuildFile section */
0B08553D215AA53100BB94D3 /* OPTLYEventTagUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B08553B215AA53100BB94D3 /* OPTLYEventTagUtil.m */; };
0B08553E215AA53100BB94D3 /* OPTLYEventTagUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B08553B215AA53100BB94D3 /* OPTLYEventTagUtil.m */; };
0B08553F215AA53100BB94D3 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B08553C215AA53100BB94D3 /* OPTLYEventTagUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
0B085540215AA53100BB94D3 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B08553C215AA53100BB94D3 /* OPTLYEventTagUtil.h */; settings = {ATTRIBUTES = (Public, ); }; };
0B08553F215AA53100BB94D3 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B08553C215AA53100BB94D3 /* OPTLYEventTagUtil.h */; };
0B085540215AA53100BB94D3 /* OPTLYEventTagUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B08553C215AA53100BB94D3 /* OPTLYEventTagUtil.h */; };
0B2E93B520D072BF00E0893E /* OPTLYDatafileConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B2E93B020D072BE00E0893E /* OPTLYDatafileConfig.m */; };
0B2E93B620D072BF00E0893E /* OPTLYDatafileConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B2E93B020D072BE00E0893E /* OPTLYDatafileConfig.m */; };
0B2E93B920D072BF00E0893E /* OPTLYDatafileConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 0B2E93B220D072BE00E0893E /* OPTLYDatafileConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -1963,7 +1963,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
RESOURCES_TARGETED_DEVICE_FAMILY = "";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -2036,7 +2036,7 @@
OPTIMIZELY_SDK_VERSION = "$(OPTIMIZELY_SDK_VERSION_MAJOR).$(OPTIMIZELY_SDK_VERSION_MINOR).$(OPTIMIZELY_SDK_VERSION_PATCH)$(OPTIMIZELY_SDK_VERSION_SUFFIX)";
OPTIMIZELY_SDK_VERSION_MAJOR = 2;
OPTIMIZELY_SDK_VERSION_MINOR = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 1;
OPTIMIZELY_SDK_VERSION_PATCH = 2;
OPTIMIZELY_SDK_VERSION_SUFFIX = "";
RESOURCES_TARGETED_DEVICE_FAMILY = "";
SDKROOT = iphoneos;
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_END
@interface OPTLYEventBuilderDefault : NSObject<OPTLYEventBuilder>

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

/**
* Initialize the default event build with the project config.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ typedef int(^OPTLYFMDBExecuteStatementsCallbackBlock)(NSDictionary *resultsDicti
*/

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

/** Last insert rowid
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_END
@interface OPTLYEventBuilderDefault : NSObject<OPTLYEventBuilder>

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

/**
* Initialize the default event build with the project config.
Expand Down
Loading

0 comments on commit ce6676c

Please sign in to comment.