refactor: Moved dependency management from buildSrc to Version Catalog

app/build.gradle.kts

@@ -14,8 +14,19 @@
  *  limitations under the License.
  */
 plugins {
-    id(Plugins.APPLICATION.id)
-    id(Plugins.KOTLIN.id)
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.multiplatform)
+}
+
+kotlin {
+    androidTarget {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "${JavaVersion.VERSION_11}"
+                freeCompilerArgs += "-Xjdk-release=${JavaVersion.VERSION_11}"
+            }
+        }
+    }
 }
 
 android {
@@ -46,14 +57,11 @@ android {
         // Flag to enable support for the new language APIs
         isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
     buildFeatures {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = Versions.COMPOSE_COMPILER
+        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
     packagingOptions {
         resources {
@@ -67,7 +75,7 @@ dependencies {
     // Modules
 
     Modules.values().forEach { module ->
-        apis(project(module.path))
+        api(project(module.path))
     }
 
     // Dependencies of sheets-compose-dialogs
@@ -88,38 +96,25 @@ dependencies {
 //    implementation("com.maxkeppeler.sheets-compose-dialogs:emoji:$sheetsVersion")
 
 
-    coreLibraryDesugaring(Dependencies.DESUGAR)
-
-    // Kotlin libs
-
-    implementations(Dependencies.Kotlin.KOTLIN_STD)
+    coreLibraryDesugaring(libs.desugar)
 
 
     // AndroidX libs
-
-    implementations(
-        Dependencies.AndroidX.CORE_KTX,
-        Dependencies.AndroidX.LIFECYCLE_KTX,
-        Dependencies.AndroidX.ACTIVITY_COMPOSE,
-        Dependencies.AndroidX.NAVIGATION_COMPOSE,
-    )
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(libs.androidx.navigation.compose)
 
 
     // Compose libs
 
     // Test libs
-
-    androidTestImplementations(
-        Dependencies.AndroidX.Test.TEST_CORE,
-        Dependencies.AndroidX.Test.TEST_RUNNER,
-        Dependencies.AndroidX.Test.JUNIT,
-        Dependencies.AndroidX.Test.ESPRESSO_CORE,
-        Dependencies.Compose.Test.JUNIT,
-        project(":test")
-    )
-    debugImplementations(
-        Dependencies.Compose.Test.TOOLING,
-        Dependencies.Compose.Test.MANIFEST
-    )
-    testImplementation(Dependencies.Test.JUNIT)
+    androidTestImplementation(libs.androidx.test.core)
+    androidTestImplementation(libs.androidx.runner)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(project(":test"))
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+    testImplementation(libs.junit)
 }

build.gradle.kts

@@ -13,7 +13,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-import com.android.build.gradle.LibraryExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {

gradle/libs.versions.toml

@@ -1,21 +1,44 @@
 [versions]
+activity-compose = "1.8.2"
 android = "8.2.2"
+androidx-core-ktx = "1.12.0"
 compose = "1.6.10-dev1580"
+compose-compiler = "1.5.11"
+androidx-test-core = "1.5.0"
 datetime = "0.6.0-RC.2"
 desugar = "2.0.4"
 emoji = "0.18.0"
+espresso-core = "3.5.1"
+junit = "1.1.5"
+junit-version = "4.13.2"
 kotlin = "1.9.23"
+lifecycle-runtime-ktx = "2.7.0"
+navigation-compose = "2.7.7"
 publish = "0.28.0"
+runner = "1.5.2"
 serialization = "1.6.3"
+ui-test-junit4 = "1.6.5"
 window-size = "0.5.0"
 
 [libraries]
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
+androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test-core" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-core-ktx" }
+androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junit" }
+androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso-core" }
+androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" }
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigation-compose" }
+androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
+androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "ui-test-junit4" }
+androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
+androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "datetime" }
 desugar = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugar" }
 emoji-facebook = { group = "com.vanniktech", name = "emoji-facebook", version.ref = "emoji" }
 emoji-google = { group = "com.vanniktech", name = "emoji-google", version.ref = "emoji" }
 emoji-ios = { group = "com.vanniktech", name = "emoji-ios", version.ref = "emoji" }
 emoji-twitter = { group = "com.vanniktech", name = "emoji-twitter", version.ref = "emoji" }
+junit = { module = "junit:junit", version.ref = "junit-version" }
 serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-core", version.ref = "serialization" }
 stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 window-size = { group = "dev.chrisbanes.material3", name = "material3-window-size-class-multiplatform", version.ref = "window-size" }