Merge pull request #15 from nisrulz/add/version-catalog

SmartToolFactory · web-flow · commit e53248f5cd21 · 2024-09-03T13:25:42.000+03:00
Setup version  catalog to manage dependencies
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,9 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-    id "org.jetbrains.kotlin.plugin.compose"
+    alias(libs.plugins.android.application)
+
+    alias(libs.plugins.kotlin.android)
+
+    alias(libs.plugins.compose.compiler)
 }
 
 apply from: file("../common-config.gradle")
@@ -18,36 +20,35 @@ android {
 }
 
 dependencies {
-    implementation project(':beforeafter')
+    implementation projects.beforeafter
 
     // Lifecycle
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.3'
+    implementation libs.androidx.lifecycle.runtime.ktx
 
     // Foundation (Border, Background, Box, Image, Scroll, shapes, animations, etc.)
-    implementation 'androidx.compose.foundation:foundation'
+    implementation libs.androidx.foundation
 
     // Material design icons
-    implementation 'androidx.compose.material:material-icons-core'
-    implementation 'androidx.compose.material:material-icons-extended'
+    implementation libs.androidx.material.icons.core
+    implementation libs.androidx.material.icons.extended
 
     // Optional - Add window size utils
-    implementation 'androidx.compose.material3:material3-window-size-class'
+    implementation libs.androidx.material3.window.size
     // Integration with activities
-    implementation 'androidx.activity:activity-compose:1.9.0'
+    implementation libs.androidx.activity.compose
     // Integration with ViewModels
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.3'
+    implementation libs.androidx.lifecycle.viewmodel.compose
 
     // Material Design 3 for Compose
-    implementation "androidx.compose.material3:material3"
+    implementation libs.material3
 
     // Photo Picker
-    implementation("com.google.modernstorage:modernstorage-photopicker:1.0.0-alpha06")
+    implementation(libs.modernstorage.photopicker)
 
-    final media3_version = "1.3.1"
     // For media playback using ExoPlayer
-    implementation "androidx.media3:media3-exoplayer:$media3_version"
+    implementation libs.androidx.media3.exoplayer
     // For building media playback UIs
-    implementation "androidx.media3:media3-ui:$media3_version"
+    implementation libs.androidx.media3.ui
     // Common functionality used across multiple media libraries
-    implementation "androidx.media3:media3-common:$media3_version"
+    implementation libs.androidx.media3.common
 }
diff --git a/beforeafter/build.gradle b/beforeafter/build.gradle
@@ -1,7 +1,9 @@
 plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-    id "org.jetbrains.kotlin.plugin.compose"
+    alias(libs.plugins.android.library)
+
+    alias(libs.plugins.kotlin.android)
+
+    alias(libs.plugins.compose.compiler)
 }
 
 apply from: file("../common-config.gradle")
@@ -15,8 +17,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:4.0.0'
+    implementation libs.compose.extended.gestures
 
-    implementation 'androidx.compose.ui:ui-tooling'
-    implementation "androidx.compose.runtime:runtime"
-}
+    implementation libs.androidx.compose.ui.ui.tooling
+    implementation libs.androidx.runtime
+}
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.5.0' apply false
-    id 'com.android.library' version '8.6.0' apply false
+    alias(libs.plugins.android.application) apply false
 
-    id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
-    id "org.jetbrains.kotlin.plugin.compose" version "2.0.0" apply false
+    alias(libs.plugins.android.library) apply false
+
+    alias(libs.plugins.kotlin.android) apply false
+
+    alias(libs.plugins.compose.compiler) apply false
 }
 
 tasks.register('clean', Delete) {
     delete rootProject.getBuildTreePath()
-}
+}
diff --git a/common-config.gradle b/common-config.gradle
@@ -35,30 +35,29 @@ composeCompiler {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation libs.androidx.core.ktx
 
     // Jetpack Compose
-    def composeBom = platform('androidx.compose:compose-bom:2024.06.00')
-    implementation composeBom
-    androidTestImplementation composeBom
+    implementation platform(libs.androidx.compose.bom)
+    androidTestImplementation platform(libs.androidx.compose.bom)
 
     // Tooling support (Previews, etc.)
-    implementation 'androidx.compose.ui:ui-tooling-preview'
-    debugImplementation 'androidx.compose.ui:ui-tooling'
+    implementation libs.ui.tooling.preview
+    debugImplementation libs.ui.tooling
 
-    implementation 'androidx.compose.ui:ui'
+    implementation libs.ui
 
     // Material Design
-    implementation "androidx.compose.material:material"
+    implementation libs.androidx.material
 
     // Jetpack Compose - Testing
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
-    debugImplementation 'androidx.compose.ui:ui-test-manifest'
+    androidTestImplementation libs.ui.test.junit4
+    debugImplementation libs.ui.test.manifest
 
     // Testing
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 
 
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,83 @@
+[versions]
+
+#region ---- Kotlin version dependent
+# https://github.com/JetBrains/kotlin/releases
+composeExtendedGestures = "4.0.0"
+kotlin = "2.0.10"
+# https://github.com/google/ksp/releases
+ksp = "2.0.10-1.0.24"
+#endregion
+
+#region ---- Android Core
+agp = "8.5.2"
+androidTools = "31.5.2"
+coreKtx = "1.13.1"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+lifecycleRuntimeKtx = "2.8.4"
+activityCompose = "1.9.1"
+composeBom = "2024.06.00"
+appcompat = "1.7.0"
+lifecycleViewmodelCompose = "2.8.4"
+material = "1.12.0"
+#endregion
+
+media3Common = "1.4.0"
+media3Exoplayer = "1.4.0"
+media3Ui = "1.4.0"
+modernstoragePhotopicker = "1.0.0-alpha06"
+
+[libraries]
+
+# build-logic
+android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
+android-tools-common = { module = "com.android.tools:common", version.ref = "androidTools" }
+androidx-compose-ui-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
+androidx-foundation = { module = "androidx.compose.foundation:foundation" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" }
+androidx-material = { module = "androidx.compose.material:material" }
+androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
+androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
+androidx-material3-window-size = { module = "androidx.compose.material3:material3-window-size-class" }
+androidx-media3-common = { module = "androidx.media3:media3-common", version.ref = "media3Common" }
+androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3Exoplayer" }
+androidx-media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3Ui" }
+androidx-runtime = { module = "androidx.compose.runtime:runtime" }
+compose-extended-gestures = { module = "com.github.SmartToolFactory:Compose-Extended-Gestures", version.ref = "composeExtendedGestures" }
+compose-gradle-plugin = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+material3 = { module = "androidx.compose.material3:material3" }
+modernstorage-photopicker = { module = "com.google.modernstorage:modernstorage-photopicker", version.ref = "modernstoragePhotopicker" }
+symbol-processing-gradle-plugin = { module = "com.google.devtools.ksp:symbol-processing-gradle-plugin", version.ref = "ksp" }
+#----- end
+
+
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+
+ui = { module = "androidx.compose.ui:ui" }
+ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
+ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
+ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
+ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
+
+[plugins]
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/settings.gradle b/settings.gradle
@@ -21,6 +21,9 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Compose BeforeAfter"
+// For accessing modules as type safe values
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+
+rootProject.name = "Compose-BeforeAfter"
 include ':app'
 include ':beforeafter'

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,9 @@ dependencyResolutionManagement {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`-rootProject.name = "Compose BeforeAfter"`
	`24`	`+// For accessing modules as type safe values`
	`25`	`+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")`
	`26`	`+`
	`27`	`+rootProject.name = "Compose-BeforeAfter"`
`25`	`28`	`include ':app'`
`26`	`29`	`include ':beforeafter'`