From 6fac8ae39975bf44f151e03bc91526681afc26d8 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 16:05:21 -0300 Subject: [PATCH 1/4] Update iOS SDK --- splitio/pubspec.yaml | 4 +++- splitio_ios/ios/splitio_ios.podspec | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/splitio/pubspec.yaml b/splitio/pubspec.yaml index 22ec144..9c957f9 100644 --- a/splitio/pubspec.yaml +++ b/splitio/pubspec.yaml @@ -22,7 +22,9 @@ dependencies: # splitio_android: ^0.1.8 splitio_android: path: ../splitio_android - splitio_ios: ^0.1.8 + # splitio_ios: ^0.1.8 + splitio_ios: + path: ../splitio_ios splitio_platform_interface: ^1.4.0 dev_dependencies: diff --git a/splitio_ios/ios/splitio_ios.podspec b/splitio_ios/ios/splitio_ios.podspec index a723bf4..9fcdaeb 100644 --- a/splitio_ios/ios/splitio_ios.podspec +++ b/splitio_ios/ios/splitio_ios.podspec @@ -4,7 +4,7 @@ # Pod::Spec.new do |s| s.name = 'splitio_ios' - s.version = '0.4.0' + s.version = '0.5.0' s.summary = 'split.io official Flutter plugin.' s.description = <<-DESC split.io official Flutter plugin. @@ -15,7 +15,7 @@ split.io official Flutter plugin. s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'Flutter' - s.dependency 'Split', '~> 2.24.3' + s.dependency 'Split', '~> 2.25.0' s.platform = :ios, '9.0' # Flutter.framework does not contain a i386 slice. From a199eeb19706de66397c7c15a33a8e140f381aae Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 16:07:45 -0300 Subject: [PATCH 2/4] Update splitio_ios/example --- .../example/ios/Flutter/AppFrameworkInfo.plist | 2 +- splitio_ios/example/ios/Podfile.lock | 12 ++++++------ .../example/ios/Runner.xcodeproj/project.pbxproj | 13 ++++++++----- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- splitio_ios/example/ios/Runner/Info.plist | 4 ++++ 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/splitio_ios/example/ios/Flutter/AppFrameworkInfo.plist b/splitio_ios/example/ios/Flutter/AppFrameworkInfo.plist index 8d4492f..7c56964 100644 --- a/splitio_ios/example/ios/Flutter/AppFrameworkInfo.plist +++ b/splitio_ios/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 12.0 diff --git a/splitio_ios/example/ios/Podfile.lock b/splitio_ios/example/ios/Podfile.lock index 69856b8..522e427 100644 --- a/splitio_ios/example/ios/Podfile.lock +++ b/splitio_ios/example/ios/Podfile.lock @@ -1,9 +1,9 @@ PODS: - Flutter (1.0.0) - - Split (2.24.3) - - splitio_ios (0.4.0): + - Split (2.25.0) + - splitio_ios (0.5.0): - Flutter - - Split (~> 2.24.3) + - Split (~> 2.25.0) DEPENDENCIES: - Flutter (from `Flutter`) @@ -20,9 +20,9 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/splitio_ios/ios" SPEC CHECKSUMS: - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - Split: 49b2d7a93a57062f4de8f210071b30cc86727937 - splitio_ios: 173af2c0f8e068a5f96e4d13f7c661aba8e09db0 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + Split: 268875814285de6ab6cd25744e170b407651a080 + splitio_ios: f6af0613ceedf0c037673afe256479bb0f6fc6ec PODFILE CHECKSUM: aed42fc5c94ade572556b7ed357c5c57f1bd83a2 diff --git a/splitio_ios/example/ios/Runner.xcodeproj/project.pbxproj b/splitio_ios/example/ios/Runner.xcodeproj/project.pbxproj index 7f3b9bb..667bff1 100644 --- a/splitio_ios/example/ios/Runner.xcodeproj/project.pbxproj +++ b/splitio_ios/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -231,7 +231,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1300; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -309,10 +309,12 @@ }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -379,6 +381,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -487,7 +490,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -564,7 +567,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -613,7 +616,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/splitio_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/splitio_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 087c2dd..e0c9630 100644 --- a/splitio_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/splitio_ios/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ UIViewControllerBasedStatusBarAppearance + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + From ad441bd1a353f936e37923967e0ad2b20f3dee4b Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 16:11:26 -0300 Subject: [PATCH 3/4] Update splitio/example/ios --- splitio/example/ios/Flutter/AppFrameworkInfo.plist | 2 +- splitio/example/ios/Podfile.lock | 12 ++++++------ splitio/example/ios/Runner.xcodeproj/project.pbxproj | 8 ++++---- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/splitio/example/ios/Flutter/AppFrameworkInfo.plist b/splitio/example/ios/Flutter/AppFrameworkInfo.plist index 9625e10..7c56964 100644 --- a/splitio/example/ios/Flutter/AppFrameworkInfo.plist +++ b/splitio/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/splitio/example/ios/Podfile.lock b/splitio/example/ios/Podfile.lock index 06aad74..6d9b1ac 100644 --- a/splitio/example/ios/Podfile.lock +++ b/splitio/example/ios/Podfile.lock @@ -1,9 +1,9 @@ PODS: - Flutter (1.0.0) - - Split (2.24.3) - - splitio_ios (0.4.0): + - Split (2.25.0) + - splitio_ios (0.5.0): - Flutter - - Split (~> 2.24.2) + - Split (~> 2.25.0) DEPENDENCIES: - Flutter (from `Flutter`) @@ -20,9 +20,9 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/splitio_ios/ios" SPEC CHECKSUMS: - Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - Split: 49b2d7a93a57062f4de8f210071b30cc86727937 - splitio_ios: a2e051130df42c320c500d90b3005999af7eefe8 + Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 + Split: 268875814285de6ab6cd25744e170b407651a080 + splitio_ios: f6af0613ceedf0c037673afe256479bb0f6fc6ec PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048 diff --git a/splitio/example/ios/Runner.xcodeproj/project.pbxproj b/splitio/example/ios/Runner.xcodeproj/project.pbxproj index a69a7aa..be642f5 100644 --- a/splitio/example/ios/Runner.xcodeproj/project.pbxproj +++ b/splitio/example/ios/Runner.xcodeproj/project.pbxproj @@ -164,7 +164,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1300; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -351,7 +351,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -428,7 +428,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -477,7 +477,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/splitio/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/splitio/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 087c2dd..e0c9630 100644 --- a/splitio/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/splitio/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Wed, 22 May 2024 16:52:35 -0300 Subject: [PATCH 4/4] Update test class --- .../example/ios/SplitTests/SplitTests.swift | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/splitio_ios/example/ios/SplitTests/SplitTests.swift b/splitio_ios/example/ios/SplitTests/SplitTests.swift index c01d314..7f378bb 100644 --- a/splitio_ios/example/ios/SplitTests/SplitTests.swift +++ b/splitio_ios/example/ios/SplitTests/SplitTests.swift @@ -334,7 +334,6 @@ class SplitFactoryStub: SplitFactory { } class SplitClientStub: SplitClient { - var destroyCalled: Bool = false var methodCalls = [ "getTreatment": false, @@ -407,8 +406,20 @@ class SplitClientStub: SplitClient { return [:] } + func on(event: SplitEvent, runInBackground: Bool, execute action: @escaping SplitAction) { + if event == .sdkReady { + sdkReadyEventAction = action + } + } + + func on(event: SplitEvent, queue: DispatchQueue, execute action: @escaping SplitAction) { + if event == .sdkReady { + sdkReadyEventAction = action + } + } + func on(event: SplitEvent, execute action: @escaping SplitAction) { - if event == SplitEvent.sdkReady { + if event == .sdkReady { sdkReadyEventAction = action } }