From d9c88ecf6a26bd26fe86ecc89dfff1c2eaee3f90 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Thu, 29 May 2025 23:01:25 +0600 Subject: [PATCH 01/15] Update java sdk version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index be722e00..ddbfdddd 100644 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,7 @@ ext { build_tools_version = "30.0.3" min_sdk_version = 21 target_sdk_version = 33 - java_core_ver = "4.2.0" + java_core_ver = "4.2.2" android_logger_ver = "1.3.6" jacksonversion= "2.11.2" annotations_ver = "1.2.0" From 7939621fe080c4fc70dbc050da3323db38b84756 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Thu, 29 May 2025 23:47:58 +0600 Subject: [PATCH 02/15] Update setup java v4 --- .github/workflows/android.yml | 2 +- .github/workflows/build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e1e3820a..8e1fe21f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -86,7 +86,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: set up JDK 17 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: '17' - name: Enable KVM diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4222a0e6..31943371 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,9 +22,9 @@ jobs: run_build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' From 4c6340ff27b6a3c40351a7f8e4d80cb9cd45d619 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Thu, 29 May 2025 23:50:16 +0600 Subject: [PATCH 03/15] update cache key --- .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 31943371..bc6ef120 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: with: java-version: '17' distribution: 'temurin' - cache: gradle + cache: gradle-v2 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Clean all modules From c8ab4b37b749480633e0093597061425652b5505 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 00:09:15 +0600 Subject: [PATCH 04/15] clean up --- .github/workflows/android.yml | 2 +- .github/workflows/build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 8e1fe21f..fdb3ec9f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -86,7 +86,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: java-version: '17' - name: Enable KVM diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc6ef120..8d6eabd1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,11 +24,11 @@ jobs: steps: - uses: actions/checkout@v4 - name: set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: java-version: '17' distribution: 'temurin' - cache: gradle-v2 + cache: gradle - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Clean all modules From e1a62deab25bd4f925e85b9a80c8b93bd1dac509 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 00:12:23 +0600 Subject: [PATCH 05/15] clean up --- .github/workflows/android.yml | 2 +- .github/workflows/build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index fdb3ec9f..e1e3820a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -86,7 +86,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v1 with: java-version: '17' - name: Enable KVM diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d6eabd1..397bb9f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: with: java-version: '17' distribution: 'temurin' - cache: gradle +# cache: gradle - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Clean all modules From b9a02037b32a1c7f7c4a721821eb143eab487cfd Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 00:28:56 +0600 Subject: [PATCH 06/15] add logger dependency --- android-sdk/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle index 7a597478..62b818e4 100644 --- a/android-sdk/build.gradle +++ b/android-sdk/build.gradle @@ -69,6 +69,8 @@ dependencies { exclude group: 'com.google.code.findbugs' } + implementation "org.slf4j:slf4j-api:1.7.32" + compileOnly "com.fasterxml.jackson.core:jackson-databind:$jacksonversion" implementation "androidx.annotation:annotation:$annotations_ver" From c270f7140ab8ff7cb3a9b94cf15ec0d6d45fb8f0 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 00:47:21 +0600 Subject: [PATCH 07/15] update jvm target --- .github/workflows/build.yml | 7 ++++++- odp/build.gradle | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 397bb9f2..9d844474 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,9 +28,14 @@ jobs: with: java-version: '17' distribution: 'temurin' -# cache: gradle - name: Grant execute permission for gradlew run: chmod +x gradlew + + - name: Setup Gradle cache + uses: gradle/gradle-build-action@v2 + with: + gradle-version: wrapper + - name: Clean all modules run: ./gradlew cleanAllModules - name: ${{ inputs.action }} diff --git a/odp/build.gradle b/odp/build.gradle index 4550d5d7..0a7107c8 100644 --- a/odp/build.gradle +++ b/odp/build.gradle @@ -48,7 +48,7 @@ android { buildToolsVersion build_tools_version kotlinOptions { - jvmTarget = '1.8' + jvmTarget = '17' } } @@ -57,6 +57,8 @@ dependencies { implementation "androidx.annotation:annotation:$annotations_ver" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.work:work-runtime:$work_runtime" + // Add SLF4J API for Logger interface + implementation "org.slf4j:slf4j-api:1.7.32" testImplementation "junit:junit:$junit_ver" testImplementation "org.mockito:mockito-core:$mockito_ver" @@ -74,4 +76,5 @@ dependencies { androidTestImplementation "org.mockito:mockito-core:$mockito_ver" androidTestImplementation "org.mockito:mockito-android:$mockito_ver" + androidTestImplementation "org.slf4j:slf4j-api:1.7.32" } From f8f4f3c1ed9cb126ebcba1b770dd020c9d0a829d Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 06:47:19 +0600 Subject: [PATCH 08/15] update build yml --- .github/workflows/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d844474..1db93558 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,12 +30,6 @@ jobs: distribution: 'temurin' - name: Grant execute permission for gradlew run: chmod +x gradlew - - - name: Setup Gradle cache - uses: gradle/gradle-build-action@v2 - with: - gradle-version: wrapper - - name: Clean all modules run: ./gradlew cleanAllModules - name: ${{ inputs.action }} From 5546e4414a66af082b55a9a8e5e0717f28df1288 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 06:52:22 +0600 Subject: [PATCH 09/15] update build yml --- .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 1db93558..9561ba61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '17' distribution: 'temurin' From 5c390c04f66b986aeda7a9e29ae27034a33095ee Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 06:56:51 +0600 Subject: [PATCH 10/15] update yml --- .github/workflows/android.yml | 2 +- .github/workflows/build.yml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index e1e3820a..b2f1dcb4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -72,7 +72,7 @@ jobs: echo "$GITHUB_CONTEXT" home/runner/ci-helper-tools/trigger-script-with-status-update.sh build: - uses: optimizely/android-sdk/.github/workflows/build.yml@master + uses: optimizely/android-sdk/.github/workflows/build.yml@muzahid/bump-java-sdk-4.2.2 with: action: build test: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9561ba61..659a2b5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,14 @@ jobs: steps: - uses: actions/checkout@v4 - name: set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' + - name: Setup Gradle cache + uses: gradle/gradle-build-action@v2 + with: + gradle-version: wrapper - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Clean all modules From 41ed5450485f1616b6778706647999044ad0ca7e Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 07:09:04 +0600 Subject: [PATCH 11/15] clean up --- .../com/optimizely/ab/android/sdk/OptimizelyClientTest.java | 2 +- .../com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java b/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java index b7f2f7b4..c320fe78 100644 --- a/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java +++ b/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java @@ -82,7 +82,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; +import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; @RunWith(Parameterized.class) 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..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,7 +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.* +import org.mockito.Mockito.mock import org.mockito.Mockito.verify @RunWith(AndroidJUnit4::class) From 33f01954748863fad9b56522a154ec0cbb2bee97 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 07:15:56 +0600 Subject: [PATCH 12/15] clean up --- .../com/optimizely/ab/android/sdk/OptimizelyClientTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java b/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java index c320fe78..b7f2f7b4 100644 --- a/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java +++ b/android-sdk/src/androidTest/java/com/optimizely/ab/android/sdk/OptimizelyClientTest.java @@ -82,7 +82,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; @RunWith(Parameterized.class) From 48dc434b595540ca1aa7bd771020278f378e1b09 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 20:04:03 +0600 Subject: [PATCH 13/15] Downgrade jvm target --- odp/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/odp/build.gradle b/odp/build.gradle index 0a7107c8..4f9d1dbf 100644 --- a/odp/build.gradle +++ b/odp/build.gradle @@ -48,7 +48,7 @@ android { buildToolsVersion build_tools_version kotlinOptions { - jvmTarget = '17' + jvmTarget = '1.8' } } From 1fed50c8e5bff5cf5dd08172cb010a89d3cf9c28 Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 20:25:59 +0600 Subject: [PATCH 14/15] clean up --- android-sdk/build.gradle | 2 +- build.gradle | 1 + odp/build.gradle | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle index 62b818e4..e1f343b5 100644 --- a/android-sdk/build.gradle +++ b/android-sdk/build.gradle @@ -69,7 +69,7 @@ dependencies { exclude group: 'com.google.code.findbugs' } - implementation "org.slf4j:slf4j-api:1.7.32" + implementation "org.slf4j:slf4j-api:$slf4j_ver" compileOnly "com.fasterxml.jackson.core:jackson-databind:$jacksonversion" implementation "androidx.annotation:annotation:$annotations_ver" diff --git a/build.gradle b/build.gradle index ddbfdddd..b4d3c3f0 100644 --- a/build.gradle +++ b/build.gradle @@ -88,6 +88,7 @@ ext { androidx_test_core = "1.4.0" androidx_test_rules = "1.4.0" espresso_ver = "3.4.0" + slf4j_ver = "1.7.3" } task clean(type: Delete) { diff --git a/odp/build.gradle b/odp/build.gradle index 4f9d1dbf..fc7b85de 100644 --- a/odp/build.gradle +++ b/odp/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "androidx.work:work-runtime:$work_runtime" // Add SLF4J API for Logger interface - implementation "org.slf4j:slf4j-api:1.7.32" + implementation "org.slf4j:slf4j-api:$slf4j_ver" testImplementation "junit:junit:$junit_ver" testImplementation "org.mockito:mockito-core:$mockito_ver" @@ -76,5 +76,5 @@ dependencies { androidTestImplementation "org.mockito:mockito-core:$mockito_ver" androidTestImplementation "org.mockito:mockito-android:$mockito_ver" - androidTestImplementation "org.slf4j:slf4j-api:1.7.32" + androidTestImplementation "org.slf4j:slf4j-api:$slf4j_ver" } From dcdee9c7cbb9a5737727b79745d3ee9753bd7bfc Mon Sep 17 00:00:00 2001 From: muzahidul-opti Date: Fri, 30 May 2025 20:29:59 +0600 Subject: [PATCH 15/15] clean up --- .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 b2f1dcb4..e1e3820a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -72,7 +72,7 @@ jobs: echo "$GITHUB_CONTEXT" home/runner/ci-helper-tools/trigger-script-with-status-update.sh build: - uses: optimizely/android-sdk/.github/workflows/build.yml@muzahid/bump-java-sdk-4.2.2 + uses: optimizely/android-sdk/.github/workflows/build.yml@master with: action: build test: