Skip to content

Commit 5504a03

Browse files
author
Krzysztof
authored
chore(android): Bump test dependencies to support jdk17 (#775)
1 parent b3d1b68 commit 5504a03

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

android/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ buildscript {
4747
}
4848
dependencies {
4949
if (project == rootProject) {
50-
classpath 'com.android.tools.build:gradle:3.6.4'
50+
classpath 'com.android.tools.build:gradle:4.2.2'
5151
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$asyncStorageKtVersion"
5252
}
5353
}
@@ -80,7 +80,7 @@ android {
8080
compileSdkVersion safeExtGet('compileSdkVersion', 31)
8181
defaultConfig {
8282
minSdkVersion safeExtGet('minSdkVersion', 21)
83-
targetSdkVersion safeExtGet('targetSdkVersion', 29)
83+
targetSdkVersion safeExtGet('targetSdkVersion', 31)
8484
buildConfigField "Long", "AsyncStorage_db_size", "${dbSizeInMB}L"
8585
buildConfigField "boolean", "AsyncStorage_useDedicatedExecutor", "${useDedicatedExecutor}"
8686
buildConfigField "boolean", "AsyncStorage_useNextStorage", "${useNextStorage}"
@@ -91,11 +91,10 @@ android {
9191

9292
if (useNextStorage) {
9393
testOptions {
94-
unitTests.returnDefaultValues = true
95-
}
96-
compileOptions {
97-
sourceCompatibility JavaVersion.VERSION_1_8
98-
targetCompatibility JavaVersion.VERSION_1_8
94+
unitTests {
95+
returnDefaultValues = true
96+
includeAndroidResources = true
97+
}
9998
}
10099
}
101100
}
@@ -119,10 +118,11 @@ dependencies {
119118
// would add one automatically, probably a version that is not compatible with
120119
// used kotlin
121120
def kotlinReflect_version = project.ext.asyncStorageKtVersion
122-
def junit_version = "4.12"
123-
def robolectric_version = "4.5.1"
124-
def truth_version = "1.1.2"
125-
def androidxtest_version = "1.1.0"
121+
def junit_version = "4.13.2"
122+
def robolectric_version = "4.7.3"
123+
def truth_version = "1.1.3"
124+
def androidxtest_version = "1.4.0"
125+
def androidtest_junit_version = "1.1.3"
126126

127127
implementation "androidx.room:room-runtime:$room_version"
128128
implementation "androidx.room:room-ktx:$room_version"
@@ -134,7 +134,7 @@ dependencies {
134134
testImplementation "junit:junit:$junit_version"
135135
testImplementation "androidx.test:runner:$androidxtest_version"
136136
testImplementation "androidx.test:rules:$androidxtest_version"
137-
testImplementation "androidx.test.ext:junit:$androidxtest_version"
137+
testImplementation "androidx.test.ext:junit:$androidtest_junit_version"
138138
testImplementation "org.robolectric:robolectric:$robolectric_version"
139139
testImplementation "com.google.truth:truth:$truth_version"
140140
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesTest_version"

android/src/test/java/com/reactnativecommunity/asyncstorage/next/StorageTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ class AsyncStorageAccessTest {
129129
"key2":"value2",
130130
"key3":{
131131
"key4":"value4",
132-
"key5":"value5",
133132
"key6":{
134133
"key7":"value7",
135134
"key8":"value8"
136-
}
135+
},
136+
"key5":"value5"
137137
}
138138
}
139139
""".trimMargin()

0 commit comments

Comments
 (0)