Skip to content

Commit 8e57a4c

Browse files
authored
Update OkHttp to 5.1.0 and update Kotlin to 2.2.0 (#119)
1 parent 3e392c5 commit 8e57a4c

File tree

7 files changed

+13
-5
lines changed

7 files changed

+13
-5
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@
88
.externalNativeBuild
99
.cxx
1010
local.properties
11+
12+
.kotlin

app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
alias(libs.plugins.android.application)
33
alias(libs.plugins.jetbrains.kotlin.android)
4+
alias(libs.plugins.compose.compiler)
45
}
56

67
android {

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ plugins {
33
alias(libs.plugins.android.application) apply false
44
alias(libs.plugins.jetbrains.kotlin.android) apply false
55
alias(libs.plugins.android.library) apply false
6+
alias(libs.plugins.compose.compiler) apply false
67
}

gradle/libs.versions.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[versions]
2-
agp = "8.5.1"
3-
kotlin = "1.9.24"
2+
agp = "8.12.2"
3+
kotlin = "2.2.0"
4+
kotlinx-immutable = "0.4.0"
45
coreKtx = "1.13.1"
56
junit = "4.13.2"
67
jsonunit = "3.4.1"
78
appcompat = "1.7.0"
89
material = "1.12.0"
910
moshi = "1.15.1"
10-
okhttp = "4.12.0"
11+
okhttp = "5.1.0"
1112
assertj = "3.26.3"
1213
lifecycleProcess = "2.8.4"
1314
kotlinxCoroutinesTest = "1.8.1"
@@ -23,6 +24,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version
2324
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
2425
androidx-lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycleProcess" }
2526
kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" }
27+
kotlinx-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version.ref = "kotlinx-immutable" }
2628
moshi-kotlin = { group = "com.squareup.moshi", name="moshi-kotlin", version.ref = "moshi" }
2729
moshi-adapters = { group = "com.squareup.moshi", name="moshi-adapters", version.ref = "moshi" }
2830
robolectric-test = { group = "org.robolectric", name = "robolectric", version = "4.13" }
@@ -44,3 +46,4 @@ androidx-runtime-livedata = { group = "androidx.compose.runtime", name = "runtim
4446
android-application = { id = "com.android.application", version.ref = "agp" }
4547
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
4648
android-library = { id = "com.android.library", version.ref = "agp" }
49+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

unleashandroidsdk/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ dependencies {
7373
implementation(libs.androidx.lifecycle.process)
7474
implementation(libs.moshi.kotlin)
7575
implementation(libs.moshi.adapters)
76+
implementation(libs.kotlinx.immutable)
7677
api(libs.okhttp)
7778

7879
testImplementation(libs.junit)

unleashandroidsdk/src/main/java/io/getunleash/android/DefaultUnleash.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import io.getunleash.android.metrics.NoOpMetrics
3131
import io.getunleash.android.polling.UnleashFetcher
3232
import io.getunleash.android.tasks.DataJob
3333
import io.getunleash.android.tasks.LifecycleAwareTaskManager
34+
import kotlinx.collections.immutable.toImmutableList
3435
import kotlinx.coroutines.CoroutineExceptionHandler
3536
import kotlinx.coroutines.CoroutineScope
3637
import kotlinx.coroutines.Dispatchers
@@ -47,7 +48,6 @@ import kotlinx.coroutines.launch
4748
import kotlinx.coroutines.runBlocking
4849
import kotlinx.coroutines.withContext
4950
import kotlinx.coroutines.withTimeout
50-
import okhttp3.internal.toImmutableList
5151
import java.io.File
5252
import java.util.concurrent.TimeoutException
5353
import java.util.concurrent.atomic.AtomicBoolean

0 commit comments

Comments
 (0)