Skip to content

Commit

Permalink
migrate to version catalog
Browse files Browse the repository at this point in the history
  • Loading branch information
Razeeman committed Dec 22, 2024
1 parent d24e96a commit 4970e1c
Show file tree
Hide file tree
Showing 46 changed files with 440 additions and 555 deletions.
31 changes: 15 additions & 16 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import com.example.util.simpletimetracker.Base
import com.example.util.simpletimetracker.Deps
import com.example.util.simpletimetracker.applyAndroidLibrary

plugins {
id(com.example.util.simpletimetracker.BuildPlugins.gradleApplication)
id(com.example.util.simpletimetracker.BuildPlugins.kotlin)
id(com.example.util.simpletimetracker.BuildPlugins.ksp)
id(com.example.util.simpletimetracker.BuildPlugins.hiltPlugin)
alias(libs.plugins.gradleApplication)
alias(libs.plugins.kotlin)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
}

applyAndroidLibrary()
Expand Down Expand Up @@ -116,17 +115,17 @@ dependencies {
implementation(project(":feature_change_goals:views"))
"playImplementation"(project(":feature_wear"))

implementation(Deps.Androidx.room)
implementation(Deps.Ktx.navigationFragment)
implementation(Deps.Ktx.navigationUi)
implementation(Deps.Google.dagger)
implementation(libs.androidx.room)
implementation(libs.ktx.navigationFragment)
implementation(libs.ktx.navigationUi)
implementation(libs.google.dagger)

ksp(Deps.Kapt.dagger)
kspAndroidTest(Deps.Kapt.dagger)
ksp(libs.kapt.dagger)
kspAndroidTest(libs.kapt.dagger)

androidTestImplementation(Deps.UiTest.junit)
androidTestImplementation(Deps.UiTest.espresso)
androidTestImplementation(Deps.UiTest.espressoContrib)
androidTestImplementation(Deps.UiTest.dagger)
androidTestImplementation(Deps.UiTest.room)
androidTestImplementation(libs.uitest.junit)
androidTestImplementation(libs.uitest.espresso)
androidTestImplementation(libs.uitest.espressoContrib)
androidTestImplementation(libs.uitest.dagger)
androidTestImplementation(libs.uitest.room)
}
25 changes: 9 additions & 16 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
plugins {
id(com.example.util.simpletimetracker.BuildPlugins.ksp)
.version(com.example.util.simpletimetracker.Versions.ksp)
.apply(false)
id(com.example.util.simpletimetracker.BuildPlugins.gradleApplication)
.version(com.example.util.simpletimetracker.Versions.gradle)
.apply(false)
id(com.example.util.simpletimetracker.BuildPlugins.kotlin)
.version(com.example.util.simpletimetracker.Versions.kotlin)
.apply(false)
id(com.example.util.simpletimetracker.BuildPlugins.ktlint)
.version(com.example.util.simpletimetracker.Versions.ktlint)
.apply(false)
id(com.example.util.simpletimetracker.BuildPlugins.hilt)
.version(com.example.util.simpletimetracker.Versions.dagger)
.apply(false)
alias(libs.plugins.gradleApplication) apply false
alias(libs.plugins.gradleLibrary) apply false
alias(libs.plugins.kotlin) apply false
alias(libs.plugins.kotlinParcelize) apply false
alias(libs.plugins.kotlinLibrary) apply false
alias(libs.plugins.ktlint) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.ksp) apply false
}

allprojects {
Expand All @@ -22,7 +15,7 @@ allprojects {
mavenCentral()
}

apply(plugin = com.example.util.simpletimetracker.BuildPlugins.ktlint)
apply(plugin = rootProject.libs.plugins.ktlint.get().pluginId)
}

tasks {
Expand Down

This file was deleted.

135 changes: 0 additions & 135 deletions buildSrc/src/main/kotlin/com/example/util/simpletimetracker/Deps.kt

This file was deleted.

This file was deleted.

45 changes: 22 additions & 23 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import com.example.util.simpletimetracker.Base
import com.example.util.simpletimetracker.Deps
import com.example.util.simpletimetracker.applyAndroidLibrary

plugins {
id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary)
id(com.example.util.simpletimetracker.BuildPlugins.kotlin)
id(com.example.util.simpletimetracker.BuildPlugins.kotlinParcelize)
id(com.example.util.simpletimetracker.BuildPlugins.ksp)
alias(libs.plugins.gradleLibrary)
alias(libs.plugins.kotlin)
alias(libs.plugins.kotlinParcelize)
alias(libs.plugins.ksp)
}

applyAndroidLibrary()
Expand All @@ -23,23 +22,23 @@ dependencies {
api(project(":feature_base_adapter"))
api(project(":feature_views"))

api(Deps.Androidx.appcompat)
api(Deps.Androidx.recyclerView)
api(Deps.Androidx.constraintLayout)
api(Deps.Androidx.cardView)
api(Deps.Androidx.material)
api(Deps.Androidx.viewpager2)
api(Deps.Emoji.emojiBundled)
api(Deps.Google.flexBox)
api(Deps.Google.dagger)
api(Deps.Ktx.core)
api(Deps.Ktx.fragment)
api(Deps.Ktx.liveDataCore)
api(Deps.Ktx.liveData)
api(Deps.Ktx.viewModel)
api(Deps.Ktx.activity)
api(Deps.UiTest.espressoIdling)
api(libs.androidx.appcompat)
api(libs.androidx.recyclerView)
api(libs.androidx.constraintLayout)
api(libs.androidx.cardView)
api(libs.androidx.material)
api(libs.androidx.viewpager2)
api(libs.emoji.emojiBundled)
api(libs.google.flexBox)
api(libs.google.dagger)
api(libs.ktx.core)
api(libs.ktx.fragment)
api(libs.ktx.liveDataCore)
api(libs.ktx.liveData)
api(libs.ktx.viewModel)
api(libs.ktx.activity)
api(libs.uitest.espressoIdling)

testImplementation(Deps.Test.junit)
testImplementation(Deps.Test.mockito)
testImplementation(libs.test.junit)
testImplementation(libs.test.mockito)
}
15 changes: 7 additions & 8 deletions data_local/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import com.example.util.simpletimetracker.Base
import com.example.util.simpletimetracker.Deps
import com.example.util.simpletimetracker.applyAndroidLibrary

plugins {
id(com.example.util.simpletimetracker.BuildPlugins.gradleLibrary)
id(com.example.util.simpletimetracker.BuildPlugins.kotlin)
id(com.example.util.simpletimetracker.BuildPlugins.ksp)
alias(libs.plugins.gradleLibrary)
alias(libs.plugins.kotlin)
alias(libs.plugins.ksp)
}

applyAndroidLibrary()
Expand All @@ -25,9 +24,9 @@ android {
dependencies {
implementation(project(":core"))

implementation(Deps.Androidx.room)
implementation(Deps.Ktx.room)
implementation(libs.androidx.room)
implementation(libs.ktx.room)

ksp(Deps.Kapt.room)
ksp(Deps.Kapt.dagger)
ksp(libs.kapt.room)
ksp(libs.kapt.dagger)
}
Loading

0 comments on commit 4970e1c

Please sign in to comment.