update libs config

Author: ExNDY

build.gradle.kts

@@ -4,8 +4,15 @@
 
 buildscript {
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
+        gradlePluginPortal()
     }
     dependencies {
         classpath(":javascript-build-logic")
@@ -15,6 +22,6 @@ buildscript {
 allprojects {
     plugins.withId("org.gradle.maven-publish") {
         group = "dev.icerock.moko"
-        version = libs.versions.mokoJavascriptVersion.get()
+        version = moko.versions.mokoJavascriptVersion.get()
     }
 }

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlinTestVersion = "2.2.10"
+kotlinVersion = "2.2.10"
 androidAppCompatVersion = "1.7.1"
 materialDesignVersion = "1.13.0"
 androidLifecycleVersion = "2.2.0"
@@ -8,22 +8,29 @@ testJUnitExtVersion = "1.3.0"
 coroutinesVersion = "1.10.2"
 kotlinxSerializationVersion = "1.9.0"
 mokoTestVersion = "0.6.1"
-mokoJavascriptVersion = "0.4.0"
 ziplineVersion = "1.23.0"
-
+mokoMultiplatformVersion = "0.14.4"
+androidGradleVersion = "8.12.3"
+detektVersion = "1.23.8"
 
 [libraries]
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
 material = { module = "com.google.android.material:material", version.ref = "materialDesignVersion" }
 lifecycle = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "androidLifecycleVersion" }
-kotlinTestJUnit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinTestVersion" }
+kotlinTestJUnit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" }
 testRunner = { module = "androidx.test:runner", version.ref = "androidCoreTestingVersion" }
 testRules = { module = "androidx.test:rules", version.ref = "androidCoreTestingVersion" }
 testJUnitExt = { module = "androidx.test.ext:junit", version.ref = "testJUnitExtVersion" }
 testJUnitExtKtx = { module = "androidx.test.ext:junit-ktx", version.ref = "testJUnitExtVersion" }
 ziplineAndroid = { module = "app.cash.zipline:zipline-android", version.ref = "ziplineVersion" }
 coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutinesVersion" }
 kotlinSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationVersion" }
-kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlinTestVersion" }
-kotlinTestAnnotations =  { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlinTestVersion" }
+kotlinTest = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlinVersion" }
+kotlinTestAnnotations = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlinVersion" }
 mokoTest = { module = "dev.icerock.moko:test-core", version.ref = "mokoTestVersion" }
+
+mokoMultiplatform = { module = "dev.icerock:mobile-multiplatform", version.ref = "mokoMultiplatformVersion" }
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradleVersion" }
+detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detektVersion" }
+detektPlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektVersion" }

javascript-build-logic/build.gradle.kts

@@ -3,14 +3,20 @@ plugins {
 }
 
 repositories {
-    google()
-    gradlePluginPortal()
+    google {
+        content {
+            includeGroupByRegex("com\\.android.*")
+            includeGroupByRegex("com\\.google.*")
+            includeGroupByRegex("androidx.*")
+        }
+    }
     mavenCentral()
+    gradlePluginPortal()
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.14.1")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10")
-    implementation("com.android.tools.build:gradle:8.12.3")
-    implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
+    implementation(libs.mokoMultiplatform)
+    implementation(libs.kotlinGradlePlugin)
+    implementation(libs.androidGradlePlugin)
+    implementation(libs.detektPlugin)
 }

javascript-build-logic/settings.gradle.kts

@@ -6,8 +6,15 @@ rootProject.name = "javascript-build-logic"
 
 dependencyResolutionManagement {
     repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+
         mavenCentral()
-        google()
     }
 
     versionCatalogs {

javascript-build-logic/src/main/kotlin/android-base-convention.gradle.kts

@@ -8,7 +8,7 @@ configure<BaseExtension> {
     compileSdkVersion(36)
 
     defaultConfig {
-        minSdk = 21
+        minSdk = 24
         targetSdk = 36
     }
 

javascript-build-logic/src/main/kotlin/detekt-convention.gradle.kts

@@ -7,9 +7,9 @@ plugins {
 }
 
 detekt {
-    input.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin", "src/main/kotlin")
+    source.setFrom("src/commonMain/kotlin", "src/androidMain/kotlin", "src/iosMain/kotlin", "src/main/kotlin")
 }
 
 dependencies {
-    "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.15.0")
+    detektPlugins(libs.safeLibrary("detekt-formatting"))
 }

javascript-build-logic/src/main/kotlin/utils.kt

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2025 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+import org.gradle.api.GradleException
+import org.gradle.api.Project
+import org.gradle.api.artifacts.ExternalModuleDependencyBundle
+import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.provider.Provider
+
+internal val Project.libs: VersionCatalog
+    get() = this.extensions.getByType(VersionCatalogsExtension::class.java).named("libs")
+
+internal fun VersionCatalog.safeLibrary(alias: String): Provider<MinimalExternalModuleDependency> {
+    try {
+        return findLibrary(alias).get()
+    } catch (_: Exception) {
+        throw GradleException("library $alias not found in libs.versions.toml")
+    }
+}
+
+internal fun VersionCatalog.safeBundle(alias: String): Provider<ExternalModuleDependencyBundle> {
+    try {
+        return findBundle(alias).get()
+    } catch (_: Exception) {
+        throw GradleException("bundle $alias not found in libs.versions.toml")
+    }
+}

sample/android-app/build.gradle.kts

@@ -4,7 +4,6 @@
 
 plugins {
     id("android-app-convention")
-    id("kotlin-android")
 }
 
 android {

settings.gradle.kts

@@ -1,16 +1,19 @@
 /*
- * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2025 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
-rootProject.name = "moko-javascript"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {
     repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
-        google()
-
-        includeBuild("javascript-build-logic")
     }
 
     versionCatalogs {
@@ -20,6 +23,8 @@ dependencyResolutionManagement {
     }
 }
 
+rootProject.name = "moko-javascript"
+
 if (gradle.parent == null) {
     includeBuild("javascript-build-logic")
 }