Skip to content

Commit c81f912

Browse files
Dependency updates (#21)
* Dependency updates * Version update
1 parent 592fc4f commit c81f912

3 files changed

Lines changed: 28 additions & 23 deletions

File tree

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
2-
id("com.android.library").version("7.3.1").apply(false)
3-
kotlin("multiplatform").version("1.9.20").apply(false)
4-
kotlin("plugin.serialization").version("1.9.20").apply(false)
2+
id("com.android.library").version("8.9.0").apply(false)
3+
kotlin("multiplatform").version("2.1.0").apply(false)
4+
kotlin("plugin.serialization").version("2.1.0").apply(false)
55
}
66

77
tasks.register("clean", Delete::class) {
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Wed Mar 12 12:23:32 EET 2025
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

regions/build.gradle.kts

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework
23

34
plugins {
@@ -22,10 +23,9 @@ publishing {
2223
android {
2324
namespace = "com.kape.regions"
2425

25-
compileSdk = 34
26+
compileSdk = 35
2627
defaultConfig {
2728
minSdk = 21
28-
targetSdk = 34
2929
}
3030

3131
buildTypes {
@@ -38,20 +38,20 @@ android {
3838
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
3939
kotlin {
4040
group = "com.kape.android"
41-
version = "1.7.0"
41+
version = "1.7.1"
42+
43+
jvmToolchain(17)
4244

4345
// Enable the default target hierarchy.
4446
// It's a template for all possible targets and their shared source sets hardcoded in the
4547
// Kotlin Gradle plugin.
46-
targetHierarchy.default()
48+
applyDefaultHierarchyTemplate()
4749

4850
// Android
49-
android {
51+
androidTarget {
5052
publishLibraryVariants("release")
51-
compilations.all {
52-
kotlinOptions {
53-
jvmTarget = "17"
54-
}
53+
compilerOptions {
54+
jvmTarget.set(JvmTarget.JVM_17)
5555
}
5656
}
5757

@@ -78,37 +78,36 @@ kotlin {
7878
sourceSets {
7979
val commonMain by getting {
8080
dependencies {
81-
implementation("io.ktor:ktor-client-core:2.3.3")
81+
implementation("io.ktor:ktor-client-core:3.1.1")
8282
implementation("org.jetbrains.kotlin:kotlin-stdlib-common")
83-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
84-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1")
85-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
83+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1")
84+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0")
85+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
8686
}
8787
}
8888
val commonTest by getting {
8989
dependencies {
9090
implementation(kotlin("test"))
91-
implementation(kotlin("test-junit"))
9291
implementation(kotlin("test-common"))
9392
implementation(kotlin("test-annotations-common"))
9493
}
9594
}
9695
val androidMain by getting {
9796
dependencies {
9897
implementation("com.madgag.spongycastle:core:1.58.0.0")
99-
implementation("io.ktor:ktor-client-okhttp:2.3.3")
98+
implementation("io.ktor:ktor-client-okhttp:3.1.1")
10099
implementation("org.jetbrains.kotlin:kotlin-stdlib")
101100
}
102101
}
103102
val androidUnitTest by getting {
104103
dependencies {
105-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
106-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
104+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1")
105+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1")
107106
}
108107
}
109108
val iosMain by getting {
110109
dependencies {
111-
implementation("io.ktor:ktor-client-darwin:2.3.3")
110+
implementation("io.ktor:ktor-client-darwin:3.1.0")
112111
}
113112
}
114113
val iosTest by getting {
@@ -117,8 +116,13 @@ kotlin {
117116
}
118117
val tvosMain by getting {
119118
dependencies {
120-
implementation("io.ktor:ktor-client-darwin:2.3.3")
119+
implementation("io.ktor:ktor-client-darwin:3.1.0")
121120
}
122121
}
123122
}
124123
}
124+
125+
java {
126+
sourceCompatibility = JavaVersion.VERSION_17
127+
targetCompatibility = JavaVersion.VERSION_17
128+
}

0 commit comments

Comments
 (0)