Skip to content

Commit 046c7f2

Browse files
[FSSDK-11464] chore: bump java sdk version 4.2.2 (#509)
- Update yml - Add netspring support
1 parent 687f351 commit 046c7f2

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ jobs:
2222
run_build:
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v4
2626
- name: set up JDK 17
27-
uses: actions/setup-java@v2
27+
uses: actions/setup-java@v4
2828
with:
2929
java-version: '17'
3030
distribution: 'temurin'
31-
cache: gradle
31+
- name: Setup Gradle cache
32+
uses: gradle/gradle-build-action@v2
33+
with:
34+
gradle-version: wrapper
3235
- name: Grant execute permission for gradlew
3336
run: chmod +x gradlew
3437
- name: Clean all modules

android-sdk/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ dependencies {
6969
exclude group: 'com.google.code.findbugs'
7070
}
7171

72+
implementation "org.slf4j:slf4j-api:$slf4j_ver"
73+
7274
compileOnly "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
7375
implementation "androidx.annotation:annotation:$annotations_ver"
7476

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ext {
7171
build_tools_version = "30.0.3"
7272
min_sdk_version = 21
7373
target_sdk_version = 33
74-
java_core_ver = "4.2.0"
74+
java_core_ver = "4.2.2"
7575
android_logger_ver = "1.3.6"
7676
jacksonversion= "2.11.2"
7777
annotations_ver = "1.2.0"
@@ -88,6 +88,7 @@ ext {
8888
androidx_test_core = "1.4.0"
8989
androidx_test_rules = "1.4.0"
9090
espresso_ver = "3.4.0"
91+
slf4j_ver = "1.7.3"
9192
}
9293

9394
task clean(type: Delete) {

odp/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ dependencies {
5757
implementation "androidx.annotation:annotation:$annotations_ver"
5858
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5959
implementation "androidx.work:work-runtime:$work_runtime"
60+
// Add SLF4J API for Logger interface
61+
implementation "org.slf4j:slf4j-api:$slf4j_ver"
6062

6163
testImplementation "junit:junit:$junit_ver"
6264
testImplementation "org.mockito:mockito-core:$mockito_ver"
@@ -74,4 +76,5 @@ dependencies {
7476

7577
androidTestImplementation "org.mockito:mockito-core:$mockito_ver"
7678
androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
79+
androidTestImplementation "org.slf4j:slf4j-api:$slf4j_ver"
7780
}

odp/src/androidTest/java/com/optimizely/ab/android/odp/DefaultODPApiManagerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
2020
import org.junit.Assert.assertEquals
2121
import org.junit.Test
2222
import org.junit.runner.RunWith
23-
import org.mockito.Mockito.*
23+
import org.mockito.Mockito.mock
2424
import org.mockito.Mockito.verify
2525

2626
@RunWith(AndroidJUnit4::class)

0 commit comments

Comments
 (0)