Skip to content

Commit 774fb78

Browse files
feat(android): bump room to 2.4.2, allowing arm64 jdk compile (#773)
Starting with room 2.4.0-alpha03, arm64 is supported allowing native compile with arm64 jdk.
1 parent 2c2cc6d commit 774fb78

File tree

4 files changed

+18
-21
lines changed

4 files changed

+18
-21
lines changed

android/build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ buildscript {
3939
? rootProject.ext['kotlinVersion']
4040
: rootProject.hasProperty('AsyncStorage_kotlinVersion')
4141
? rootProject.properties['AsyncStorage_kotlinVersion']
42-
: '1.5.31'
42+
: '1.6.10'
4343

4444
repositories {
4545
google()
@@ -77,10 +77,10 @@ if (useNextStorage) {
7777
}
7878

7979
android {
80-
compileSdkVersion safeExtGet('compileSdkVersion', 28)
80+
compileSdkVersion safeExtGet('compileSdkVersion', 31)
8181
defaultConfig {
82-
minSdkVersion safeExtGet('minSdkVersion', 19)
83-
targetSdkVersion safeExtGet('targetSdkVersion', 28)
82+
minSdkVersion safeExtGet('minSdkVersion', 21)
83+
targetSdkVersion safeExtGet('targetSdkVersion', 29)
8484
buildConfigField "Long", "AsyncStorage_db_size", "${dbSizeInMB}L"
8585
buildConfigField "boolean", "AsyncStorage_useDedicatedExecutor", "${useDedicatedExecutor}"
8686
buildConfigField "boolean", "AsyncStorage_useNextStorage", "${useNextStorage}"
@@ -97,9 +97,6 @@ android {
9797
sourceCompatibility JavaVersion.VERSION_1_8
9898
targetCompatibility JavaVersion.VERSION_1_8
9999
}
100-
kotlinOptions {
101-
jvmTarget = "1.8"
102-
}
103100
}
104101
}
105102

@@ -115,9 +112,9 @@ repositories {
115112
dependencies {
116113

117114
if (useNextStorage) {
118-
def room_version = getVersionOrDefault('AsyncStorage_next_roomVersion', '2.3.0')
119-
def coroutines_version = "1.5.2"
120-
def coroutinesTest_version = "1.5.2"
115+
def room_version = getVersionOrDefault('AsyncStorage_next_roomVersion', '2.4.2')
116+
def coroutines_version = "1.6.0"
117+
def coroutinesTest_version = "1.6.0"
121118
// if we don't provide explicit dependency on reflection, kotlin plugin
122119
// would add one automatically, probably a version that is not compatible with
123120
// used kotlin

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"react-native": "^0.66.0-0",
8989
"react-native-builder-bob": "^0.18.0",
9090
"react-native-macos": "^0.66.0-0",
91-
"react-native-test-app": "^1.2.0",
91+
"react-native-test-app": "^1.2.1",
9292
"react-native-web": "^0.17.0",
9393
"react-native-windows": "^0.66.0-0",
9494
"react-test-renderer": "17.0.2",

website/docs/advanced/Next.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ See [Configuration](#configuration) section below to learn more about setting di
4646
buildscript {
4747
ext {
4848
// other extensions
49-
+ kotlinVersion = '1.5.31'
49+
+ kotlinVersion = '1.6.10'
5050
}
5151

5252
dependencies {
@@ -67,28 +67,28 @@ AsyncStorage_useNextStorage=true
6767

6868
**Kotlin version**
6969

70-
Next storage is tested against Kotlin version `1.5.31`.
70+
Next storage is tested against Kotlin version `1.6.10`.
7171
You can specify different version, in one of two ways:
7272

7373
- add `kotlinVersion` extension to the `rootProject`:
7474

7575
```groovy
76-
rootProject.ext.kotlinVersion = '1.5.31'
76+
rootProject.ext.kotlinVersion = '1.6.10'
7777
```
7878

7979
- specify `AsyncStorage_kotlinVersion` in `gradle.properties`:
8080

8181
```groovy
82-
AsyncStorage_kotlinVersion=1.5.31
82+
AsyncStorage_kotlinVersion=1.6.10
8383
```
8484

8585
**Room**
8686

8787
Next AsyncStorage uses [Room persistence library](https://developer.android.com/jetpack/androidx/releases/room) to store data.
88-
Currently, tested version is `2.3.0`. You can specify different version, by adding a flag to `gradle.properties`:
88+
Currently, tested version is `2.4.2`. You can specify different version, by adding a flag to `gradle.properties`:
8989

9090
```groovy
91-
AsyncStorage_next_roomVersion=2.3.0
91+
AsyncStorage_next_roomVersion=2.4.2
9292
```
9393

9494
### Notable changes

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11224,10 +11224,10 @@ react-native-macos@^0.66.0-0:
1122411224
whatwg-fetch "^3.0.0"
1122511225
ws "^6.1.4"
1122611226

11227-
react-native-test-app@^1.2.0:
11228-
version "1.2.0"
11229-
resolved "https://registry.yarnpkg.com/react-native-test-app/-/react-native-test-app-1.2.0.tgz#4f50a03df02ec735aaa87a00b5f494a383b3c486"
11230-
integrity sha512-6dVWeFluY9sDVKBNrR8lfX5jxTtxX1/Bcr/q1806280eomnEi3uVRt75wB2zcxZ8Kv+zEyujgYfjl7weCfBSQg==
11227+
react-native-test-app@^1.2.1:
11228+
version "1.2.1"
11229+
resolved "https://registry.yarnpkg.com/react-native-test-app/-/react-native-test-app-1.2.1.tgz#1dcf1b3be57689b185e019eced91223d274bbe2e"
11230+
integrity sha512-+M0cps3k95JNdCvcrq2sXmblAOzG/Zv/6xU100kRS/wn5lL/3MHTkKq/0+BKiLB/ov5iHozGcB+Sn3FqezTuhw==
1123111231
dependencies:
1123211232
ajv "^8.0.0"
1123311233
chalk "^4.1.0"

0 commit comments

Comments
 (0)