From 04a14a67645a21b5583654a6e58c839c6fb5e487 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 14:27:32 -0300 Subject: [PATCH 01/10] Update SDK version & Gradle in splitio_android --- splitio_android/android/build.gradle | 8 +++++--- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- splitio_android/android/src/main/AndroidManifest.xml | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/splitio_android/android/build.gradle b/splitio_android/android/build.gradle index e7a949b..06f53d7 100644 --- a/splitio_android/android/build.gradle +++ b/splitio_android/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:8.4.0' } } @@ -30,15 +30,17 @@ android { } defaultConfig { - minSdk 19 + minSdkVersion 19 consumerProguardFiles 'split-proguard-rules.pro' } dependencies { - implementation 'io.split.client:android-client:4.0.0' + implementation 'io.split.client:android-client:4.1.0' testImplementation 'junit:junit:4.13.2' testImplementation 'org.mockito:mockito-core:3.12.4' } + + namespace 'io.split.splitio' } diff --git a/splitio_android/android/gradle/wrapper/gradle-wrapper.properties b/splitio_android/android/gradle/wrapper/gradle-wrapper.properties index 8049c68..17655d0 100644 --- a/splitio_android/android/gradle/wrapper/gradle-wrapper.properties +++ b/splitio_android/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/splitio_android/android/src/main/AndroidManifest.xml b/splitio_android/android/src/main/AndroidManifest.xml index a1bff08..a2f47b6 100644 --- a/splitio_android/android/src/main/AndroidManifest.xml +++ b/splitio_android/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + From 735f9f03e25bcaefd2f6e26b689d555fb9a52cc2 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 14:33:55 -0300 Subject: [PATCH 02/10] Point to local version temporarily --- splitio/pubspec.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/splitio/pubspec.yaml b/splitio/pubspec.yaml index 576650b..22ec144 100644 --- a/splitio/pubspec.yaml +++ b/splitio/pubspec.yaml @@ -19,7 +19,9 @@ flutter: dependencies: flutter: sdk: flutter - splitio_android: ^0.1.8 + # splitio_android: ^0.1.8 + splitio_android: + path: ../splitio_android splitio_ios: ^0.1.8 splitio_platform_interface: ^1.4.0 From 030194c528fdb19de521c4310cbba2a1bb25f3e8 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 14:36:34 -0300 Subject: [PATCH 03/10] Modification in Android's example --- splitio/example/android/app/build.gradle | 6 +- .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 3 +- .../app/src/profile/AndroidManifest.xml | 3 +- splitio/example/android/build.gradle | 2 +- splitio/example/android/gradle.properties | 3 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- splitio/example/pubspec.lock | 80 ++++++++++++------- 8 files changed, 64 insertions(+), 38 deletions(-) diff --git a/splitio/example/android/app/build.gradle b/splitio/example/android/app/build.gradle index 0e0c772..a6a392f 100644 --- a/splitio/example/android/app/build.gradle +++ b/splitio/example/android/app/build.gradle @@ -21,11 +21,11 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' +apply id: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -48,6 +48,8 @@ android { signingConfig signingConfigs.debug } } + + namespace 'io.split.splitio_example' } flutter { diff --git a/splitio/example/android/app/src/debug/AndroidManifest.xml b/splitio/example/android/app/src/debug/AndroidManifest.xml index 2aa7fd2..f880684 100644 --- a/splitio/example/android/app/src/debug/AndroidManifest.xml +++ b/splitio/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/splitio/example/android/app/src/main/AndroidManifest.xml b/splitio/example/android/app/src/main/AndroidManifest.xml index db67ecb..61f82a9 100644 --- a/splitio/example/android/app/src/main/AndroidManifest.xml +++ b/splitio/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + diff --git a/splitio/example/android/build.gradle b/splitio/example/android/build.gradle index 0822484..45f577c 100644 --- a/splitio/example/android/build.gradle +++ b/splitio/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.4.0' } } diff --git a/splitio/example/android/gradle.properties b/splitio/example/android/gradle.properties index 94adc3a..b9a9a24 100644 --- a/splitio/example/android/gradle.properties +++ b/splitio/example/android/gradle.properties @@ -1,3 +1,6 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false diff --git a/splitio/example/android/gradle/wrapper/gradle-wrapper.properties b/splitio/example/android/gradle/wrapper/gradle-wrapper.properties index bfd9890..2a0fcc1 100644 --- a/splitio/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/splitio/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip diff --git a/splitio/example/pubspec.lock b/splitio/example/pubspec.lock index c608653..4c600ae 100644 --- a/splitio/example/pubspec.lock +++ b/splitio/example/pubspec.lock @@ -37,10 +37,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -75,14 +75,30 @@ packages: description: flutter source: sdk version: "0.0.0" - js: + leak_tracker: dependency: transitive description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "10.0.4" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + url: "https://pub.dev" + source: hosted + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -95,34 +111,34 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.12.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" plugin_platform_interface: dependency: transitive description: @@ -140,32 +156,32 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" splitio: dependency: "direct main" description: path: ".." relative: true source: path - version: "0.1.7+1-rc.1" + version: "0.1.8" splitio_android: dependency: transitive description: path: "../../splitio_android" relative: true source: path - version: "0.1.7+1-rc.1" + version: "0.1.8" splitio_ios: dependency: transitive description: name: splitio_ios - sha256: "0550cb6718a5314ef333e0440b4d1a52f6f7abaccc610dfb6a827cd876c572a7" + sha256: "852119061d2304083127030e8f3dfbb84aaac2bf4e4a0fdb7f107fd83e25f22b" url: "https://pub.dev" source: hosted - version: "0.1.7+1-rc.1" + version: "0.1.8" splitio_platform_interface: dependency: transitive description: @@ -178,18 +194,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -210,10 +226,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.7.0" vector_math: dependency: transitive description: @@ -222,6 +238,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" + source: hosted + version: "14.2.1" sdks: - dart: ">=3.0.0-0 <4.0.0" - flutter: ">=2.5.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" From 5a1bed9f7aa603bdf12a905b5cd7132af67e90a8 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 14:39:58 -0300 Subject: [PATCH 04/10] Fix --- splitio/example/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/splitio/example/android/app/build.gradle b/splitio/example/android/app/build.gradle index a6a392f..a10074f 100644 --- a/splitio/example/android/app/build.gradle +++ b/splitio/example/android/app/build.gradle @@ -21,11 +21,11 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply id: 'com.android.application' +apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdk flutter.compileSdkVersion + compileSdkVersion flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 From b7c09c710713a9f61db9e9a7c89abecccd7cc77d Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 14:43:29 -0300 Subject: [PATCH 05/10] compileSdk --- splitio/example/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/splitio/example/android/app/build.gradle b/splitio/example/android/app/build.gradle index a10074f..e231f55 100644 --- a/splitio/example/android/app/build.gradle +++ b/splitio/example/android/app/build.gradle @@ -25,8 +25,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion flutter.compileSdkVersion + compileSdk flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 From 22d59cbf30fcadf37ea6ead46353adaeee23a5a0 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 14:54:18 -0300 Subject: [PATCH 06/10] Use Java 17 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd1ed97..8c561b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: subosito/flutter-action@v2 with: channel: 'stable' From 6fac8ae39975bf44f151e03bc91526681afc26d8 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Wed, 22 May 2024 16:05:21 -0300 Subject: [PATCH 07/10] 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 08/10] 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 09/10] 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 10/10] 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 } }