Skip to content
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion odp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ android {
buildToolsVersion build_tools_version

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}

Expand All @@ -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"
Expand All @@ -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"
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading