From f9175dcb3f531cfe4855d14c674b15403398f658 Mon Sep 17 00:00:00 2001 From: pahill Date: Mon, 1 Jul 2024 17:08:06 +0200 Subject: [PATCH] Upgrade to v2 --- gradle/libs.versions.toml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle.kts | 11 ++++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b77d15e..ff2696a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -agp = "8.0.2" -kotlin = "1.9.0" +agp = "8.2.2" +kotlin = "2.0.0" nexus-publish = "2.0.0-rc-1" android-minSdk = "24" -android-compileSdk = "33" +android-compileSdk = "34" [libraries] kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c85a1f..20db9ad 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 777495d..cbbd9cb 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -1,3 +1,6 @@ +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.kotlinMultiplatform) alias(libs.plugins.androidLibrary) @@ -5,14 +8,12 @@ plugins { } kotlin { - targetHierarchy.default() jvm() androidTarget { publishLibraryVariants("release") - compilations.all { - kotlinOptions { - jvmTarget = "1.8" - } + @OptIn(ExperimentalKotlinGradlePluginApi::class) + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) } } iosX64()