diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4222a0e6..659a2b5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,13 +22,16 @@ 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' - cache: gradle + - 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 diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle index 7a597478..e1f343b5 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:$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 be722e00..b4d3c3f0 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" @@ -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 4550d5d7..fc7b85de 100644 --- a/odp/build.gradle +++ b/odp/build.gradle @@ -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:$slf4j_ver" 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:$slf4j_ver" } 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)