Merge pull request #20 from pseudoankit/migrate-to-version-catalog

Migrate to version catalog

Author: ankitk77

app/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id(Plugins.AndroidApplication)
+    id("com.android.application")
     id(Plugins.Core)
     id(Plugins.Ksp)
     id(Plugins.ComposeCore)
@@ -9,10 +9,10 @@ android {
     namespace = "pseudoankit.droid.tasky"
 
     defaultConfig {
-        applicationId = BuildConfig.App.ApplicationId
-        versionCode = BuildConfig.App.VersionCode
-        versionName = BuildConfig.App.VersionName
-        testInstrumentationRunner = BuildConfig.App.TestInstrumentationRunner
+        applicationId = "pseudoankit.droid.tasky"
+        versionCode = 1
+        versionName = "1.0"
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         vectorDrawables {
             useSupportLibrary = true
@@ -23,8 +23,8 @@ android {
         getByName("release") {
             isMinifyEnabled = true
             proguardFiles(
-                getDefaultProguardFile(BuildConfig.App.DefaultProguardOptimizeFile),
-                BuildConfig.App.ProGuardRules
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
             )
         }
         create("benchmark") {
@@ -58,12 +58,10 @@ dependencies {
         implementation(project(DeveloperTools))
     }
 
-    with(Dependencies.Compose) {
-        implementation(ComposeDestinations)
-        implementation(OrbitMvi)
-    }
+    implementation(libs.compose.destinations)
+    implementation(libs.compose.orbit.mvi)
 
-    implementation(Dependencies.Koin.Compose)
-    implementation(Dependencies.AndroidX.SplashScreen)
-    implementation(Dependencies.ProfilerInstaller)
+    implementation(libs.koin.compose)
+    implementation(libs.androidx.splashScreen)
+    implementation(libs.androidx.profilerInstaller)
 }

benchmark/build.gradle.kts

@@ -9,7 +9,7 @@ android {
     namespace = "com.pseudoankit.tasky.benchmark"
 
     defaultConfig {
-        testInstrumentationRunner = BuildConfig.App.TestInstrumentationRunner
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -45,15 +45,8 @@ dependencies {
         implementation(project(Core))
     }
 
-    with(Dependencies) {
-        implementation(Benchmark)
-    }
-
-    with(Dependencies.Test) {
-        implementation(JUnitExt)
-        implementation(EspressoCore)
-        implementation(UiAutomator)
-    }
+    implementation(libs.androidx.benchmark)
+    implementation(libs.bundles.uiTest)
 }
 
 androidComponents {

build.gradle.kts

@@ -3,27 +3,23 @@ buildscript {
         gradlePluginPortal()
         google()
         mavenCentral()
-        maven { url = uri(Dependencies.Gradle.PluginsRepo) }
+        maven { url = uri("https://plugins.gradle.org/m2/") }
     }
     dependencies {
-        classpath(Dependencies.Gradle.AndroidTools)
-        classpath(Dependencies.Gradle.KotlinGradle)
-        classpath(kotlin("serialization", version = Versions.Kotlin))
-        classpath(Dependencies.Gradle.SonarQube)
-        classpath(Dependencies.Gradle.Detekt)
+        classpath(libs.android.gradle.plugin)
+        classpath(libs.kotlin.gradle.plugin)
+        classpath(libs.kotlin.serialization.plugin)
+        classpath(libs.sonarQube.gradle.plugin)
+        classpath(libs.detekt.gradle.plugin)
+        classpath(libs.ksp.gradle.plugin)
     }
 }
 
-plugins {
-    id(Plugins.Ksp) version Versions.Compose.KspPlugin apply false
-    id(Plugins.Detekt) version Versions.Detekt
-}
-
 allprojects {
     repositories {
         google()
         mavenCentral()
-        maven { url = uri(Dependencies.Gradle.PluginsRepo) }
+        maven { url = uri("https://plugins.gradle.org/m2/") }
         maven { url = uri("https://jitpack.io") }
     }
 }

buildSrc/build.gradle.kts

@@ -9,8 +9,12 @@ repositories {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:7.4.0")
-    implementation(kotlin("gradle-plugin", "1.8.10"))
+    implementation(libs.android.gradle.plugin)
+    implementation(libs.kotlin.gradle.plugin)
+
+    // Make version catalog available in precompiled scripts
+    // https://github.com/gradle/gradle/issues/15383#issuecomment-1567461389
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
 
 gradlePlugin {

buildSrc/settings.gradle.kts

@@ -0,0 +1,19 @@
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

buildSrc/src/main/java/BuildConfig.kt

@@ -36,7 +36,6 @@ object Plugins {
     const val UnitTestPlugin = "ut-plugin"
 
     const val AndroidLibrary = "com.android.library"
-    const val AndroidApplication = "com.android.application"
     const val Ksp = "com.google.devtools.ksp"
     const val Detekt = "io.gitlab.arturbosch.detekt"
 }

buildSrc/src/main/java/Dependencies.kt

@@ -0,0 +1,26 @@
+@file:Suppress("Filename")
+
+import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.the
+
+// Make version catalog available in precompiled scripts
+// https://github.com/gradle/gradle/issues/15383#issuecomment-1567461389
+val Project.libs: LibrariesForLibs
+    get() = the<LibrariesForLibs>()
+
+internal val Project.catalog: VersionCatalog
+    get() =
+        project.extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+fun VersionCatalog.version(alias: String): String =
+    this.findVersion(alias).get().requiredVersion
+
+fun VersionCatalog.bundle(alias: String): Any =
+    this.findBundle(alias).get()
+
+fun VersionCatalog.library(alias: String): Any =
+    this.findLibrary(alias).get()

buildSrc/src/main/java/Plugins.kt

@@ -1,7 +1,7 @@
 package plugin
 
-import Dependencies
 import Plugins
+import libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
@@ -17,11 +17,9 @@ class RoomPlugin : Plugin<Project> {
         }
 
         project.dependencies {
-            with(Dependencies.Room) {
-                implementation(Ktx)
-                implementation(Runtime)
-                ksp(Compiler)
-            }
+            implementation(project.libs.room.ktx)
+            implementation(project.libs.room.runtime)
+            ksp(project.libs.room.compiler)
         }
     }
 }

buildSrc/src/main/java/VersionCatalog.kt

@@ -1,10 +1,10 @@
 package plugin
 
+import Modules
+import libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.dependencies
-import plugin.util.implementation
 import plugin.util.testImplementation
 import plugin.util.testImplementationProject
 
@@ -14,15 +14,8 @@ class UnitTestPlugin : Plugin<Project> {
     override fun apply(project: Project) {
 
         project.dependencies {
-            with(Dependencies.Test) {
-                testImplementation(mockk)
-                testImplementation(junit)
-                testImplementation(kotlinTests)
-                testImplementation(coroutine)
-                testImplementation(orbitMvi)
-                testImplementation(turbine)
-                testImplementationProject(Modules.Core.TestHelper)
-            }
+            testImplementation(project.libs.bundles.test)
+            testImplementationProject(Modules.Core.TestHelper)
         }
     }
 }