Merge and cleanup version catalogs (#3103)

buildSrc/build.gradle.kts

@@ -3,16 +3,13 @@ plugins {
 }
 
 dependencies {
-    implementation(androidx.gradle)
-    implementation(kotlinx.gradle)
-    implementation(kotlinx.compose.compiler.gradle)
+    implementation(libs.android.gradle)
+    implementation(libs.kotlin.gradle)
+    implementation(libs.kotlin.compose.compiler.gradle)
     implementation(libs.spotless.gradle)
     implementation(gradleApi())
 
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
-    implementation(files(androidx.javaClass.superclass.protectionDomain.codeSource.location))
-    implementation(files(compose.javaClass.superclass.protectionDomain.codeSource.location))
-    implementation(files(kotlinx.javaClass.superclass.protectionDomain.codeSource.location))
 }
 
 repositories {

buildSrc/settings.gradle.kts

@@ -3,15 +3,6 @@ dependencyResolutionManagement {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
-        create("androidx") {
-            from(files("../gradle/androidx.versions.toml"))
-        }
-        create("compose") {
-            from(files("../gradle/compose.versions.toml"))
-        }
-        create("kotlinx") {
-            from(files("../gradle/kotlinx.versions.toml"))
-        }
     }
 }
 

buildSrc/src/main/kotlin/mihon.code.lint.gradle.kts

@@ -22,7 +22,7 @@ spotless {
     kotlin {
         target("**/*.kt", "**/*.kts")
         targetExclude("**/build/**/*.kt")
-        ktlint(libs.ktlint.core.get().version)
+        ktlint(libs.ktlint.bom.get().version)
         trimTrailingWhitespace()
         endWithNewline()
     }

buildSrc/src/main/kotlin/mihon/buildlogic/ProjectExtensions.kt

@@ -1,9 +1,6 @@
 package mihon.buildlogic
 
 import com.android.build.api.dsl.CommonExtension
-import org.gradle.accessors.dm.LibrariesForAndroidx
-import org.gradle.accessors.dm.LibrariesForCompose
-import org.gradle.accessors.dm.LibrariesForKotlinx
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.api.tasks.testing.Test
@@ -17,9 +14,6 @@ import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginE
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
 
-val Project.androidx get() = the<LibrariesForAndroidx>()
-val Project.compose get() = the<LibrariesForCompose>()
-val Project.kotlinx get() = the<LibrariesForKotlinx>()
 val Project.libs get() = the<LibrariesForLibs>()
 
 internal fun Project.configureAndroid(commonExtension: CommonExtension<*, *, *, *, *, *>) {
@@ -54,12 +48,12 @@ internal fun Project.configureAndroid(commonExtension: CommonExtension<*, *, *,
     }
 
     dependencies {
-        "coreLibraryDesugaring"(libs.desugar)
+        "coreLibraryDesugaring"(libs.android.desugar)
     }
 }
 
 internal fun Project.configureCompose(commonExtension: CommonExtension<*, *, *, *, *, *>) {
-    pluginManager.apply(kotlinx.plugins.compose.compiler.get().pluginId)
+    pluginManager.apply(libs.plugins.kotlin.compose.compiler.get().pluginId)
 
     commonExtension.apply {
         buildFeatures {
@@ -67,7 +61,7 @@ internal fun Project.configureCompose(commonExtension: CommonExtension<*, *, *,
         }
 
         dependencies {
-            "implementation"(platform(compose.bom))
+            "implementation"(platform(libs.androidx.compose.bom))
         }
     }