Skip to content

Commit

Permalink
feat: migrating to use catalogs instead of buildSrc strategy
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielbmoro committed May 17, 2023
1 parent 4ef7341 commit d596969
Show file tree
Hide file tree
Showing 6 changed files with 110 additions and 88 deletions.
78 changes: 39 additions & 39 deletions src/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@file:Suppress("UnstableApiUsage")

@Suppress("DSL_SCOPE_VIOLATION")
plugins {
id("com.android.application")
kotlin("android")
Expand All @@ -9,15 +9,15 @@ plugins {
}

android {
compileSdk = ConfigData.compileSdkVersion
compileSdk = 33

defaultConfig {
applicationId = ConfigData.applicationId
minSdk = ConfigData.minSdkVersion
targetSdk = ConfigData.targetSdkVersion
applicationId = "com.gabrielbmoro.programmingchallenge"
minSdk = 22
targetSdk = 33

versionCode = ConfigData.versionCode
versionName = ConfigData.versionName
versionCode = 23
versionName = "1.5.1"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down Expand Up @@ -48,7 +48,7 @@ android {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = Versions.composeCompilerVersion
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}

testOptions {
Expand All @@ -60,61 +60,61 @@ android {
dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))

implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlinVersion}")
implementation(libs.kotlin)

implementation("androidx.appcompat:appcompat:${Versions.appcompatVersion}")
implementation(libs.appcompat)

implementation("androidx.swiperefreshlayout:swiperefreshlayout:${Versions.swipeRefreshVersion}")
implementation(libs.swipe.refresh.layout)

implementation("androidx.cardview:cardview:${Versions.cardViewVersion}")
implementation(libs.cardview)

kapt("androidx.room:room-compiler:${Versions.roomVersion}")
implementation("androidx.room:room-ktx:${Versions.roomVersion}")
implementation("androidx.room:room-runtime:${Versions.roomVersion}")
kapt(libs.room.compiler)
implementation(libs.room.ktx)
implementation(libs.room.runtime)

implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycleVersion}")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifecycleVersion}")
implementation(libs.lifecycle.viewmodel.ktx)
implementation(libs.lifecycle.livedata.ktx)

implementation("androidx.lifecycle:lifecycle-extensions:${Versions.lifecycleExtensionsVersion}")
implementation(libs.lifecycle.extensions)

implementation("androidx.preference:preference-ktx:${Versions.preferenceVersion}")
implementation(libs.preferences.ktx)

implementation("com.jakewharton.timber:timber:${Versions.timberVersion}")
implementation(libs.timber)

implementation("com.google.code.gson:gson:${Versions.gsonVersion}")
implementation(libs.gson)

implementation("com.squareup.retrofit2:retrofit:${Versions.retrofitVersion}")
implementation("com.squareup.retrofit2:converter-gson:${Versions.retrofitVersion}")
implementation(libs.retrofit)
implementation(libs.retrofit.converter.json)

// Dagger - Hilt
implementation("com.google.dagger:hilt-android:${Versions.hiltVersion}")
kapt("com.google.dagger:hilt-compiler:${Versions.hiltVersion}")
kapt("com.google.dagger:hilt-android-compiler:${Versions.hiltVersion}")
implementation("androidx.hilt:hilt-navigation-compose:${Versions.hiltNavigationCompose}")
implementation(libs.hilt.android)
kapt(libs.hilt.compiler)
kapt(libs.hilt.android.compiler)
implementation(libs.hilt.navigation.compose)


testImplementation("junit:junit:${Versions.junitVersion}")
testImplementation(libs.junit)

testImplementation("androidx.arch.core:core-common:${Versions.archTestCoreVersion}")
testImplementation("androidx.arch.core:core-runtime:${Versions.archTestCoreVersion}")
testImplementation("androidx.arch.core:core-testing:${Versions.archTestCoreVersion}")
testImplementation(libs.arc.core.common)
testImplementation(libs.arc.core.runtime)
testImplementation(libs.arc.core.testing)

testImplementation("com.google.truth:truth:${Versions.truthVersion}")
testImplementation("androidx.test:core:${Versions.testCoreVersion}")
testImplementation("io.mockk:mockk:${Versions.mockKVersion}")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.coroutinesVersion}")
testImplementation(libs.truth)
testImplementation(libs.mockk)
testImplementation(libs.kotlinx.coroutines.test)

// Compose
implementation(platform("androidx.compose:compose-bom:${Versions.composeBomVersion}"))
implementation(platform(libs.compose.bom))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.activity:activity-compose")
debugImplementation("androidx.compose.ui:ui-tooling")
implementation("androidx.compose.material3:material3:${Versions.composeMaterial3Version}")
implementation(libs.compose.material.get3())
implementation(libs.navigation.compose)

// Coil
implementation("io.coil-kt:coil-compose:${Versions.coilVersion}")
implementation(libs.coil)

// Navigation
implementation("androidx.navigation:navigation-compose:${Versions.navComposeIntegrationVersion}")
implementation(libs.navigation.compose)
}
6 changes: 3 additions & 3 deletions src/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:${Versions.gradleVersion}")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlinVersion}")
classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hiltVersion}")
classpath(libs.gradle)
classpath(libs.kotlin.gradle.plugin)
classpath(libs.hilt.gradle.plugin)
}
}

Expand Down
7 changes: 0 additions & 7 deletions src/buildSrc/build.gradle.kts

This file was deleted.

8 changes: 0 additions & 8 deletions src/buildSrc/src/main/java/ConfigData.kt

This file was deleted.

31 changes: 0 additions & 31 deletions src/buildSrc/src/main/java/Versions.kt

This file was deleted.

68 changes: 68 additions & 0 deletions src/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
[versions]
kotlin = "1.8.10"
hilt = "2.44"
hilt_navigation_compose = "1.0.0"
compose_bom = "2023.01.00"
compose_compiler = "1.4.3"
compose_material_3 = "1.0.1"
nav_compose_integration = "2.6.0-alpha06"
coil = "2.2.2"
appcompat = "1.6.1"
swipe_refresh = "1.2.0-alpha01"
card_view = "1.0.0"
room = "2.5.0"
lifecycle = "2.6.0"
lifecycle_extensions = "2.2.0"
preference = "1.2.0"
timber = "5.0.1"
gson = "2.9.0"
retrofit = "2.9.0"
junit = "4.13.2"
android_test = "1.1.3"
truth = "1.1.3"
test_core = "1.5.0"
arch_core = "2.2.0"
mockk = "1.12.4"
coroutines = "1.5.1-native-mt"
espresso = "3.3.0"
test_rules_version = "1.3.0"
gradle = "7.4.2"

[libraries]
kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
swipe_refresh_layout = { group = "androidx.swiperefreshlayout", name = "swiperefreshlayout", version.ref = "swipe_refresh" }
cardview = { group = "androidx.cardview", name = "cardview", version.ref = "card_view" }
room_compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
room_ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
room_runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
lifecycle_viewmodel_ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
lifecycle_livedata_ktx = { group = "androidx.lifecycle", name = "lifecycle-livedata-ktx", version.ref = "lifecycle" }
lifecycle_extensions = { group = "androidx.lifecycle", name = "lifecycle-extensions", version.ref = "lifecycle_extensions" }
preferences_ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference" }
timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
retrofit_converter_json = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
hilt_gradle_plugin = { group = "com.google.dagger", name = "hilt-android-gradle-plugin", version.ref = "hilt" }
hilt_android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
hilt_compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }
hilt_android_compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
hilt_navigation_compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hilt_navigation_compose" }
junit = { group = "junit", name = "junit", version.ref = "junit"}
arc_core_common = { group = "androidx.arch.core", name = "core-common", version.ref = "arch_core"}
arc_core_runtime = { group = "androidx.arch.core", name = "core-runtime", version.ref = "arch_core"}
arc_core_testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "arch_core"}
truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
kotlinx_coroutines_test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
compose_bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" }
compose_material_3 = { group = "androidx.compose.material3", name = "material3", version.ref = "compose_material_3" }
coil = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
navigation_compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "nav_compose_integration" }
test_core = { group= "androidx.test", name= "core", version.ref = "test_core" }
gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "gradle"}
kotlin_gradle_plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }

[plugins]
android-application = { id = "com.android.application", version.ref = "gradle" }

0 comments on commit d596969

Please sign in to comment.