Skip to content

Commit e8fdf05

Browse files
author
Krzysztof Borowy
committed
bump versions
1 parent 4df3336 commit e8fdf05

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

android/build.gradle

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ def getFlagOrDefault(flagName, defaultValue) {
2525
rootProject.hasProperty(flagName) ? rootProject.properties[flagName] == "true" : defaultValue
2626
}
2727

28+
def getVersionOfDefault(String flagName, String defaultVersion) {
29+
rootProject.hasProperty(flagName) ? rootProject.properties[flagName] : defaultVersion
30+
}
31+
2832
configurations {
2933
compileClasspath
3034
}
@@ -35,7 +39,7 @@ buildscript {
3539
? rootProject.ext['kotlinVersion']
3640
: rootProject.hasProperty('AsyncStorage_kotlinVersion')
3741
? rootProject.properties['AsyncStorage_kotlinVersion']
38-
: '1.4.21'
42+
: '1.5.31'
3943

4044
repositories {
4145
google()
@@ -90,6 +94,13 @@ android {
9094
testOptions {
9195
unitTests.returnDefaultValues = true
9296
}
97+
compileOptions {
98+
sourceCompatibility JavaVersion.VERSION_1_8
99+
targetCompatibility JavaVersion.VERSION_1_8
100+
}
101+
kotlinOptions {
102+
jvmTarget = "1.8"
103+
}
93104
}
94105
}
95106

@@ -106,16 +117,22 @@ repositories {
106117
dependencies {
107118

108119
if (useNextStorage) {
109-
def room_version = "2.2.6"
110-
def coroutines_version = "1.4.2"
120+
def room_version = getVersionOfDefault('AsyncStorage_next_roomVersion', '2.3.0')
121+
def coroutines_version = "1.5.2"
122+
def coroutinesTest_version = "1.5.2"
123+
// if we don't provide explicit dependency on reflection, kotlin plugin
124+
// would add one automatically, probably a version that is not compatible with
125+
// used kotlin
126+
def kotlinReflect_version = "1.5.31"
111127
def junit_version = "4.12"
112128
def robolectric_version = "4.5.1"
113129
def truth_version = "1.1.2"
114130
def androidxtest_version = "1.1.0"
115-
def coroutinesTest_version = "1.4.2"
116131

117132
implementation "androidx.room:room-runtime:$room_version"
118133
implementation "androidx.room:room-ktx:$room_version"
134+
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinReflect_version"
135+
119136
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
120137
kapt "androidx.room:room-compiler:$room_version"
121138

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ buildscript {
3535
rootProject.setProperty("AsyncStorage_useNextStorage", "true")
3636
}
3737
Boolean nextStorageFlag = rootProject.hasProperty("AsyncStorage_useNextStorage") ? rootProject.properties["AsyncStorage_useNextStorage"] == "true" : false
38-
println("[Async Storage] Using Next storage: " + nextStorageFlag)
38+
println("[AsyncStorage] Using Next storage: " + nextStorageFlag)
3939

4040
repositories {
4141
google()

0 commit comments

Comments
 (0)