Merge pull request #10 from skydoves/update/dependencies

Bump dependencies and cleanup kmp configurations
skydoves · Apr 23, 2024 · 07a67bf · 07a67bf
2 parents fbe4aad + ce4d20c
commit 07a67bf
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/compose-stable-marker/build.gradle.kts b/compose-stable-marker/build.gradle.kts
@@ -44,20 +44,27 @@ mavenPublishing {
 kotlin {
   jvmToolchain(11)
 
-  androidTarget { publishLibraryVariants("release") }
-
-  jvm()
-
-  iosX64()
-  iosArm64()
-  iosSimulatorArm64()
+  listOf(
+    iosX64(),
+    iosArm64(),
+    iosSimulatorArm64(),
+    macosArm64(),
+    macosX64(),
+  ).forEach {
+    it.binaries.framework {
+      baseName = "common"
+    }
+  }
 
-  macosX64()
-  macosArm64()
+  androidTarget {
+    publishLibraryVariants("release")
+  }
 
-  js(IR) {
-    browser()
-    binaries.executable()
+  jvm {
+    libs.versions.jvmTarget.get().toInt()
+    compilations.all {
+      kotlinOptions.jvmTarget = libs.versions.jvmTarget.get()
+    }
   }
 
   applyDefaultHierarchyTemplate()
@@ -78,4 +85,14 @@ android {
     sourceCompatibility = JavaVersion.VERSION_11
     targetCompatibility = JavaVersion.VERSION_11
   }
+}
+
+java {
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
+}
+
+tasks.withType(JavaCompile::class.java).configureEach {
+  this.targetCompatibility = JavaVersion.VERSION_11.toString()
+  this.sourceCompatibility = JavaVersion.VERSION_11.toString()
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,22 @@
 [versions]
-kotlin = "1.9.20"
+kotlin = "1.9.23"
 dokka = "1.9.10"
 jvmTarget = "11"
 nexusPlugin = "0.25.3"
 kotlinxCoroutines = "1.7.2"
 kotlinxTime = "0.4.0"
 kotlinBinaryCompatibility = "0.13.2"
-androidGradlePlugin = "8.1.3"
+androidGradlePlugin = "8.3.2"
 androidxActivity = "1.7.2"
 androidxMaterial = "1.9.0"
-androidxComposeBom = "2023.10.01"
-androidxComposeCompiler = "1.5.4"
+androidxComposeBom = "2024.04.01"
+androidxComposeCompiler = "1.5.11"
 androidxComposeConstraintLayout = "1.0.1"
 androidxCore = "1.12.0"
 androidxTestRunner = "1.5.2"
 androidxTestRules = "1.5.0"
 androidxJunit = "1.1.5"
-androidxMacroBenchmark = "1.2.0"
+androidxMacroBenchmark = "1.2.4"
 androidxProfileinstaller = "1.3.1"
 androidxUiAutomator = "2.3.0-alpha02"
 spotless = "6.20.0"
@@ -28,7 +28,6 @@ kotlinx-time = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", ver
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }
 androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-compose-material = { group = "androidx.compose.material", name = "material" }
 androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
 androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
@@ -50,7 +49,6 @@ android-application = { id = "com.android.application", version.ref = "androidGr
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 nexus-plugin = { id = "com.vanniktech.maven.publish", version.ref = "nexusPlugin" }