From cb7dbae4a208cba843f08650a86880d3a371fb18 Mon Sep 17 00:00:00 2001 From: Iva Nedeleva Date: Wed, 12 Mar 2025 16:11:50 +0200 Subject: [PATCH 1/2] Dependency updates --- build.gradle.kts | 6 ++-- gradle/wrapper/gradle-wrapper.properties | 3 +- regions/build.gradle.kts | 40 +++++++++++++----------- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ef51245..158953c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("com.android.library").version("7.3.1").apply(false) - kotlin("multiplatform").version("1.9.20").apply(false) - kotlin("plugin.serialization").version("1.9.20").apply(false) + id("com.android.library").version("8.9.0").apply(false) + kotlin("multiplatform").version("2.1.0").apply(false) + kotlin("plugin.serialization").version("2.1.0").apply(false) } tasks.register("clean", Delete::class) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 31cca49..c269e6a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Wed Mar 12 12:23:32 EET 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/regions/build.gradle.kts b/regions/build.gradle.kts index d7effd3..94be097 100644 --- a/regions/build.gradle.kts +++ b/regions/build.gradle.kts @@ -1,3 +1,4 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFramework plugins { @@ -22,10 +23,9 @@ publishing { android { namespace = "com.kape.regions" - compileSdk = 34 + compileSdk = 35 defaultConfig { minSdk = 21 - targetSdk = 34 } buildTypes { @@ -40,18 +40,18 @@ kotlin { group = "com.kape.android" version = "1.7.0" + jvmToolchain(17) + // Enable the default target hierarchy. // It's a template for all possible targets and their shared source sets hardcoded in the // Kotlin Gradle plugin. - targetHierarchy.default() + applyDefaultHierarchyTemplate() // Android - android { + androidTarget { publishLibraryVariants("release") - compilations.all { - kotlinOptions { - jvmTarget = "17" - } + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) } } @@ -78,17 +78,16 @@ kotlin { sourceSets { val commonMain by getting { dependencies { - implementation("io.ktor:ktor-client-core:2.3.3") + implementation("io.ktor:ktor-client-core:3.1.1") implementation("org.jetbrains.kotlin:kotlin-stdlib-common") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") } } val commonTest by getting { dependencies { implementation(kotlin("test")) - implementation(kotlin("test-junit")) implementation(kotlin("test-common")) implementation(kotlin("test-annotations-common")) } @@ -96,19 +95,19 @@ kotlin { val androidMain by getting { dependencies { implementation("com.madgag.spongycastle:core:1.58.0.0") - implementation("io.ktor:ktor-client-okhttp:2.3.3") + implementation("io.ktor:ktor-client-okhttp:3.1.1") implementation("org.jetbrains.kotlin:kotlin-stdlib") } } val androidUnitTest by getting { dependencies { - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.1") } } val iosMain by getting { dependencies { - implementation("io.ktor:ktor-client-darwin:2.3.3") + implementation("io.ktor:ktor-client-darwin:3.1.0") } } val iosTest by getting { @@ -117,8 +116,13 @@ kotlin { } val tvosMain by getting { dependencies { - implementation("io.ktor:ktor-client-darwin:2.3.3") + implementation("io.ktor:ktor-client-darwin:3.1.0") } } } } + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} From f0a37b9484a6114d3956ae1705707e420300fcdd Mon Sep 17 00:00:00 2001 From: Iva Nedeleva Date: Thu, 13 Mar 2025 09:34:10 +0200 Subject: [PATCH 2/2] Version update --- regions/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regions/build.gradle.kts b/regions/build.gradle.kts index 94be097..5295827 100644 --- a/regions/build.gradle.kts +++ b/regions/build.gradle.kts @@ -38,7 +38,7 @@ android { @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class) kotlin { group = "com.kape.android" - version = "1.7.0" + version = "1.7.1" jvmToolchain(17)