Use libs-fork.versions.toml

Author: igordmn

buildSrc-fork/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXForkTargetsExtensions.kt

@@ -19,6 +19,7 @@ package org.jetbrains.androidx.build
 import androidx.build.AndroidXMultiplatformExtension
 import androidx.build.PlatformIdentifier
 import androidx.build.configurePinnedKotlinLibraries
+import androidx.build.getVersionByName
 import androidx.build.multiplatformExtension
 import org.gradle.api.Action
 import org.gradle.api.Project
@@ -30,7 +31,6 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetWithSimulatorTes
 import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
 import org.jetbrains.kotlin.konan.target.KonanTarget
-import org.tomlj.Toml
 
 private fun KotlinJsTest.passTestFlagsToEnvironment() {
     listOf(
@@ -51,10 +51,7 @@ fun <T> AndroidXMultiplatformExtension.configureForkWebTarget(
     createTarget: (KotlinJsTargetDsl.() -> Unit) -> T,
     block: Action<KotlinJsTargetDsl>? = null,
 ): T? {
-    val toml = Toml.parse(
-        project.rootProject.projectDir.resolve("gradle/libs.versions.toml").toPath()
-    )
-    val skikoVersion = toml.getTable("versions")!!.getString("skiko")!!
+    val skikoVersion = project.getVersionByName("skiko")
     val skikoWasm = project.configurations.findByName("skikoWasm")
         ?: project.configurations.create("skikoWasm")
 

buildSrc/settings-fork.gradle

@@ -16,6 +16,17 @@
 
 rootProject.buildFileName = "../buildSrc-fork/build.gradle"
 
+dependencyResolutionManagement {
+    // the default libs.version.toml is automatically registered by Gradle under `libs` name.
+    // to avoid the conflict with `libs-fork`, rename it
+    defaultLibrariesExtensionName = "aospLibs"
+    versionCatalogs {
+        libs {
+            from(files("../gradle/libs-fork.versions.toml"))
+        }
+    }
+}
+
 def includeProject(String projectPath, String projectDir) {
     include projectPath
     project(projectPath).projectDir = new File(projectDir)
@@ -47,20 +58,3 @@ includeProject(":imports:inspection-gradle-plugin", "../buildSrc-fork/imports/in
 includeProject(":imports:room-gradle-plugin", "../buildSrc-fork/imports/room-gradle-plugin")
 includeProject(":imports:glance-layout-generator", "../buildSrc-fork/imports/glance-layout-generator")
 includeProject(":imports:stableaidl-gradle-plugin", "../buildSrc-fork/imports/stableaidl-gradle-plugin")
-
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            def agpOverride = System.getenv("GRADLE_PLUGIN_VERSION")
-            if (agpOverride != null) {
-                logger.warn("Using custom version ${agpOverride} of AGP due to GRADLE_PLUGIN_VERSION being set.")
-                version('androidGradlePlugin', agpOverride)
-            }
-            def lintOverride = System.getenv("LINT_VERSION")
-            if (lintOverride != null) {
-                logger.warn("Using custom version ${lintOverride} of Lint due to LINT_VERSION being set.")
-                version('androidLint', lintOverride)
-            }
-        }
-    }
-}

settings-fork.gradle

@@ -4,6 +4,17 @@ rootProject.buildFileName = "build-fork.gradle"
 
 enableFeaturePreview "STABLE_CONFIGURATION_CACHE"
 
+dependencyResolutionManagement {
+    // the default libs.version.toml is automatically registered by Gradle under `libs` name.
+    // to avoid the conflict with `libs-fork`, rename it
+    defaultLibrariesExtensionName = "aospLibs"
+    versionCatalogs {
+        libs {
+            from(files("gradle/libs-fork.versions.toml"))
+        }
+    }
+}
+
 def supportRootFolder = buildscript.sourceFile.getParentFile()
 skikoSetup.defineSkikoInVersionCatalog(settings)
 
@@ -128,28 +139,6 @@ switch (cacheSetting) {
 
 rootProject.name = "compose-multiplatform-core"
 
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            def metalavaOverride = System.getenv("METALAVA_VERSION")
-            if (metalavaOverride != null) {
-                logger.warn("Using custom version ${metalavaOverride} of metalava due to METALAVA_VERSION being set.")
-                version('metalava', metalavaOverride)
-            }
-            def agpOverride = System.getenv("GRADLE_PLUGIN_VERSION")
-            if (agpOverride != null) {
-                logger.warn("Using custom version ${agpOverride} of AGP due to GRADLE_PLUGIN_VERSION being set.")
-                version('androidGradlePlugin', agpOverride)
-            }
-            def lintOverride = System.getenv("LINT_VERSION")
-            if (lintOverride != null) {
-                logger.warn("Using custom version ${lintOverride} of Lint due to LINT_VERSION being set.")
-                version('androidLint', lintOverride)
-            }
-        }
-    }
-}
-
 /////////////////////////////
 //
 // Buildscript utils