Update kotlin to 1.9.24

05nelsonm · Jun 15, 2024 · 6a66d43 · 6a66d43
1 parent 4b7ad4f
commit 6a66d43
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt b/build-logic/src/main/kotlin/-KmpConfigurationExtension.kt
@@ -13,25 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-import io.matthewnelson.kmp.configuration.ExperimentalKmpConfigurationApi
 import io.matthewnelson.kmp.configuration.extension.KmpConfigurationExtension
 import io.matthewnelson.kmp.configuration.extension.container.target.KmpConfigurationContainerDsl
 import org.gradle.api.Action
 import org.gradle.api.JavaVersion
 
 fun KmpConfigurationExtension.configureShared(
-    java9ModuleName: String? = null,
     publish: Boolean = false,
-    action: Action<KmpConfigurationContainerDsl>
+    action: Action<KmpConfigurationContainerDsl>,
 ) {
     configure {
         jvm {
             kotlinJvmTarget = JavaVersion.VERSION_1_8
             compileSourceCompatibility = JavaVersion.VERSION_1_8
             compileTargetCompatibility = JavaVersion.VERSION_1_8
-
-            @OptIn(ExperimentalKmpConfigurationApi::class)
-            java9MultiReleaseModuleInfo(java9ModuleName)
         }
 
         js {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,14 +2,14 @@
 androidx-test-core = "1.5.0"
 androidx-test-runner = "1.5.2"
 
-encoding = "2.2.1"
-
-gradle-android = "8.1.4"
+gradle-android = "8.2.2"
 gradle-binary-compat = "0.14.0"
-gradle-kmp-configuration = "0.2.1"
-gradle-kotlin = "1.9.23"
-gradle-publish-maven = "0.27.0"
+gradle-kmp-configuration = "0.2.2"
+gradle-kotlin = "1.9.24"
+gradle-publish-maven = "0.28.0"
 
+# tests
+encoding = "2.2.1"
 kotlincrypto-hash = "0.5.1"
 
 [libraries]

diff --git a/library/file-test-android/build.gradle.kts b/library/file-test-android/build.gradle.kts
@@ -21,8 +21,8 @@ kmpConfiguration {
     configure {
         androidLibrary {
             android {
-                buildToolsVersion = "33.0.2"
-                compileSdk = 33
+                buildToolsVersion = "34.0.0"
+                compileSdk = 34
                 namespace = "io.matthewnelson.kmp.file.test.android"
 
                 defaultConfig {

diff --git a/library/file/build.gradle.kts b/library/file/build.gradle.kts
@@ -13,14 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
+import io.matthewnelson.kmp.configuration.ExperimentalKmpConfigurationApi
+
 plugins {
     id("configuration")
 }
 
 private val testConfig = TestConfigInject()
 
 kmpConfiguration {
-    configureShared(java9ModuleName = "io.matthewnelson.kmp.file", publish = true) {
+    configureShared(publish = true) {
+        jvm {
+            @OptIn(ExperimentalKmpConfigurationApi::class)
+            java9ModuleInfoName = "io.matthewnelson.kmp.file"
+        }
+
         common {
             sourceSetTest {
                 kotlin.srcDir(testConfig.testConfigSrcDir)