From 44d9f5e724e47c0fabdcf55c2a6dbb7881f01374 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 3 Jan 2025 18:56:10 +0600 Subject: [PATCH 1/5] Update gradle to 7.3.3 --- gradle/wrapper/gradle-wrapper.properties | 6 +++--- .../optimizely/ab/android/odp/DefaultODPApiManagerTest.kt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7ce850e5..ccde960b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Thu Jan 28 11:38:35 PST 2021 +#Fri Jan 03 18:52:27 BDT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip org.gradle.jvmargs=-Xmx1g +zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip diff --git a/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt b/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt index f95f7e27..0a58e10f 100644 --- a/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt +++ b/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt @@ -20,7 +20,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.mockito.Mockito.* import org.mockito.Mockito.verify @RunWith(AndroidJUnit4::class) From a56bd913327efe21fa9c577b3aff1299ffaa5e65 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 3 Jan 2025 20:03:31 +0600 Subject: [PATCH 2/5] wip: set gradle 7.5 --- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ccde960b..053b9429 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Fri Jan 03 18:52:27 BDT 2025 +#Fri Jan 03 20:03:08 BDT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip org.gradle.jvmargs=-Xmx1g zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 187a8d4ba56b8465b1cd92d7f70ded34762586b3 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 3 Jan 2025 22:54:16 +0600 Subject: [PATCH 3/5] fix: kotline compile issue resolved --- odp/build.gradle | 3 +-- .../com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/odp/build.gradle b/odp/build.gradle index 4550d5d7..ac2e6b58 100644 --- a/odp/build.gradle +++ b/odp/build.gradle @@ -46,9 +46,8 @@ android { targetCompatibility JavaVersion.VERSION_17 } buildToolsVersion build_tools_version - kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } diff --git a/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt b/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt index 0a58e10f..8918f8a3 100644 --- a/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt +++ b/odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt @@ -20,6 +20,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith +import org.mockito.Mockito.mock import org.mockito.Mockito.verify @RunWith(AndroidJUnit4::class) From bcd96715521ecd8c23cdf505c6ba0d23118ef092 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Fri, 3 Jan 2025 23:38:54 +0600 Subject: [PATCH 4/5] fix: update matrix --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 454162f4..766ba8f2 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -84,7 +84,7 @@ jobs: strategy: fail-fast: false matrix: - api-level: [21, 25, 26, 29] + api-level: [24, 25, 26, 29] steps: - name: checkout uses: actions/checkout@v2 From 36beaf66d334690448c838b3f010fba403bf1d82 Mon Sep 17 00:00:00 2001 From: Muzahidul Islam Date: Wed, 12 Mar 2025 23:58:36 +0600 Subject: [PATCH 5/5] update mockito version --- .github/workflows/android.yml | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 159ee940..e1e3820a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - api-level: [24, 25, 26, 29] + api-level: [21, 25, 26, 29] steps: - name: checkout uses: actions/checkout@v4 diff --git a/build.gradle b/build.gradle index be722e00..11cf0f60 100644 --- a/build.gradle +++ b/build.gradle @@ -76,7 +76,7 @@ ext { jacksonversion= "2.11.2" annotations_ver = "1.2.0" junit_ver = "4.12" - mockito_ver = "4.11.0" + mockito_ver = "5.11.0" mockito_ver_sdk_module = "3.6.28" powermock_ver = "2.0.9" support_test_runner_ver = "0.5"