Replace buildSrc with gradle version catalog

pull/2165/head
Alex Baker 1 year ago
parent 5ecc604b37
commit 7ced8a2fdc

@ -1,3 +1,5 @@
@file:Suppress("UnstableApiUsage")
import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
plugins {
@ -48,15 +50,15 @@ android {
textReport = true
}
compileSdk = Versions.compileSdk
compileSdk = 33
defaultConfig {
testApplicationId = "org.tasks.test"
applicationId = "org.tasks"
versionCode = 130200
versionName = "13.2"
targetSdk = Versions.targetSdk
minSdk = Versions.minSdk
targetSdk = 33
minSdk = 24
testInstrumentationRunner = "org.tasks.TestRunner"
kapt {
@ -88,7 +90,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion = Versions.compose_compiler
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
kotlinOptions {
@ -177,34 +179,27 @@ dependencies {
implementation("org.dmfs:lib-recur:0.11.4")
implementation("org.dmfs:jems:1.33")
implementation("com.google.dagger:hilt-android:${Versions.hilt}")
kapt("com.google.dagger:hilt-compiler:${Versions.hilt}")
kapt("androidx.hilt:hilt-compiler:${Versions.hilt_androidx}")
implementation("androidx.hilt:hilt-work:${Versions.hilt_androidx}")
implementation(libs.dagger.hilt)
kapt(libs.dagger.hilt.compiler)
kapt(libs.androidx.hilt.compiler)
implementation(libs.androidx.hilt.work)
implementation("androidx.fragment:fragment-ktx:1.5.5")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:${Versions.lifecycle}")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.lifecycle}")
implementation("androidx.room:room-ktx:${Versions.room}")
kapt("androidx.room:room-compiler:${Versions.room}")
implementation(libs.androidx.lifecycle.runtime)
implementation(libs.androidx.lifecycle.viewmodel)
implementation(libs.androidx.room)
kapt(libs.androidx.room.compiler)
implementation("androidx.appcompat:appcompat:1.6.0")
implementation("androidx.paging:paging-runtime:3.1.1")
implementation("io.noties.markwon:core:${Versions.markwon}")
implementation("io.noties.markwon:editor:${Versions.markwon}")
implementation("io.noties.markwon:ext-tasklist:${Versions.markwon}")
implementation("io.noties.markwon:ext-strikethrough:${Versions.markwon}")
implementation("io.noties.markwon:ext-tables:${Versions.markwon}")
implementation("io.noties.markwon:linkify:${Versions.markwon}")
implementation(libs.bundles.markwon)
debugImplementation("com.facebook.flipper:flipper:${Versions.flipper}")
debugImplementation("com.facebook.flipper:flipper-network-plugin:${Versions.flipper}")
debugImplementation("com.facebook.soloader:soloader:0.10.5")
debugImplementation("com.squareup.leakcanary:leakcanary-android:${Versions.leakcanary}")
debugImplementation(libs.bundles.flipper)
debugImplementation(libs.leakcanary)
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}")
debugImplementation(libs.kotlin.reflect)
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}")
implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}")
implementation(libs.kotlin.jdk8)
implementation(libs.okhttp)
implementation("com.github.franmontiel:PersistentCookieJar:v1.0.1")
implementation("com.google.code.gson:gson:2.9.0")
implementation("com.google.android.material:material:1.8.0")
@ -223,40 +218,35 @@ dependencies {
implementation("com.google.apis:google-api-services-tasks:v1-rev20210709-1.32.1")
implementation("com.google.apis:google-api-services-drive:v3-rev20210725-1.32.1")
implementation("com.google.auth:google-auth-library-oauth2-http:0.26.0")
implementation("androidx.work:work-runtime:${Versions.work}")
implementation("androidx.work:work-runtime-ktx:${Versions.work}")
implementation(libs.androidx.work)
implementation("com.etebase:client:2.3.2")
implementation("com.github.QuadFlask:colorpicker:0.0.15")
implementation("net.openid:appauth:0.11.1")
implementation("org.osmdroid:osmdroid-android:6.1.11@aar")
implementation("com.squareup.retrofit2:retrofit:${Versions.retrofit}")
implementation("com.squareup.retrofit2:converter-moshi:${Versions.retrofit}")
implementation(libs.bundles.retrofit)
implementation("androidx.recyclerview:recyclerview:1.3.0-rc01")
implementation(platform("androidx.compose:compose-bom:${Versions.compose_bom}"))
implementation(platform(libs.androidx.compose))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.foundation:foundation")
implementation("androidx.compose.material:material")
implementation("androidx.compose.runtime:runtime-livedata")
implementation("com.google.android.material:compose-theme-adapter:${Versions.compose_theme_adapter}")
implementation(libs.compose.theme.adapter)
implementation("androidx.activity:activity-compose:1.6.1")
implementation("androidx.compose.material:material-icons-extended")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
implementation("androidx.compose.ui:ui-viewbinding")
implementation("io.coil-kt:coil-compose:${Versions.coil}")
implementation("io.coil-kt:coil-video:${Versions.coil}")
implementation("io.coil-kt:coil-svg:${Versions.coil}")
implementation("io.coil-kt:coil-gif:${Versions.coil}")
implementation(libs.bundles.coil)
releaseCompileOnly("androidx.compose.ui:ui-tooling")
implementation("com.google.accompanist:accompanist-flowlayout:${Versions.accompanist}")
implementation("com.google.accompanist:accompanist-permissions:${Versions.accompanist}")
implementation(libs.accompanist.flowlayout)
implementation(libs.accompanist.permissions)
googleplayImplementation("com.google.firebase:firebase-crashlytics:${Versions.crashlytics}")
googleplayImplementation("com.google.firebase:firebase-analytics:${Versions.analytics}") {
googleplayImplementation(libs.firebase.crashlytics)
googleplayImplementation(libs.firebase.analytics) {
exclude("com.google.android.gms", "play-services-ads-identifier")
}
googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}")
googleplayImplementation(libs.firebase.config)
googleplayImplementation("com.google.android.gms:play-services-location:19.0.1")
googleplayImplementation("com.google.android.gms:play-services-maps:18.1.0")
googleplayImplementation("com.android.billingclient:billing-ktx:4.0.0")
@ -264,20 +254,20 @@ dependencies {
googleplayImplementation("com.google.android.play:core-ktx:1.8.1")
googleplayImplementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
androidTestImplementation("com.google.dagger:hilt-android-testing:${Versions.hilt}")
kaptAndroidTest("com.google.dagger:hilt-compiler:${Versions.hilt}")
kaptAndroidTest("androidx.hilt:hilt-compiler:${Versions.hilt_androidx}")
androidTestImplementation("org.mockito:mockito-android:${Versions.mockito}")
androidTestImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}")
androidTestImplementation("androidx.test:runner:${Versions.androidx_test}")
androidTestImplementation("androidx.test:rules:${Versions.androidx_test}")
androidTestImplementation(libs.dagger.hilt.testing)
kaptAndroidTest(libs.dagger.hilt.compiler)
kaptAndroidTest(libs.androidx.hilt.compiler)
androidTestImplementation(libs.mockito.android)
androidTestImplementation(libs.make.it.easy)
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.androidx.test.rules)
androidTestImplementation("androidx.test.ext:junit:1.1.4")
androidTestImplementation("com.squareup.okhttp3:mockwebserver:${Versions.okhttp}")
androidTestImplementation(libs.okhttp.mockwebserver)
testImplementation("junit:junit:4.13.2")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
testImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}")
testImplementation("androidx.test:core:${Versions.androidx_test}")
testImplementation("org.mockito:mockito-core:${Versions.mockito}")
testImplementation(libs.make.it.easy)
testImplementation(libs.androidx.test.core)
testImplementation(libs.mockito.core)
testImplementation("org.ogce:xpp3:1.1.6")
}

@ -8,8 +8,8 @@ buildscript {
classpath("com.android.tools.build:gradle:7.4.2")
classpath("com.google.gms:google-services:4.3.15")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}")
classpath("com.google.dagger:hilt-android-gradle-plugin:${libs.versions.dagger.hilt.get()}")
classpath("com.google.android.gms:oss-licenses-plugin:0.10.6")
}
}

@ -1,7 +0,0 @@
plugins {
`kotlin-dsl`
}
repositories {
mavenCentral()
}

@ -1,27 +0,0 @@
object Versions {
const val kotlin = "1.8.0"
const val compileSdk = 33
const val targetSdk = 33
const val minSdk = 24
const val work = "2.7.1"
const val leakcanary = "2.10"
const val room = "2.4.2"
const val crashlytics = "18.2.11"
const val analytics = "20.1.0"
const val remote_config = "21.0.1"
const val okhttp = "4.10.0"
const val flipper = "0.177.0"
const val mockito = "3.9.0"
const val androidx_test = "1.3.0"
const val make_it_easy = "4.0.1"
const val hilt = "2.44.2"
const val hilt_androidx = "1.0.0"
const val lifecycle = "2.4.1"
const val markwon = "4.6.2"
const val compose_compiler = "1.4.0"
const val compose_bom = "2023.01.00"
const val compose_theme_adapter = "1.1.11"
const val accompanist = "0.24.12-rc"
const val coil = "2.2.0"
const val retrofit = "2.9.0"
}

@ -378,7 +378,7 @@
+| \--- com.atlassian.commonmark:commonmark:0.13.0
++--- io.noties.markwon:editor:4.6.2
+| \--- io.noties.markwon:core:4.6.2 (*)
++--- io.noties.markwon:ext-tasklist:4.6.2
++--- io.noties.markwon:linkify:4.6.2
+| \--- io.noties.markwon:core:4.6.2 (*)
++--- io.noties.markwon:ext-strikethrough:4.6.2
+| +--- io.noties.markwon:core:4.6.2 (*)
@ -388,7 +388,7 @@
+| +--- io.noties.markwon:core:4.6.2 (*)
+| \--- com.atlassian.commonmark:commonmark-ext-gfm-tables:0.13.0
+| \--- com.atlassian.commonmark:commonmark:0.13.0
++--- io.noties.markwon:linkify:4.6.2
++--- io.noties.markwon:ext-tasklist:4.6.2
+| \--- io.noties.markwon:core:4.6.2 (*)
++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 (*)
++--- com.squareup.okhttp3:okhttp:4.10.0 (*)
@ -452,7 +452,6 @@
+| +--- com.google.http-client:google-http-client:1.39.2 (*)
+| +--- com.google.http-client:google-http-client-gson:1.39.2 (*)
+| \--- com.google.guava:guava:30.1.1-android (*)
++--- androidx.work:work-runtime:2.7.1 (*)
++--- androidx.work:work-runtime-ktx:2.7.1
+| +--- androidx.work:work-runtime:2.7.1 (*)
+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.8.0 (*)

@ -514,7 +514,7 @@
+| \--- com.atlassian.commonmark:commonmark:0.13.0
++--- io.noties.markwon:editor:4.6.2
+| \--- io.noties.markwon:core:4.6.2 (*)
++--- io.noties.markwon:ext-tasklist:4.6.2
++--- io.noties.markwon:linkify:4.6.2
+| \--- io.noties.markwon:core:4.6.2 (*)
++--- io.noties.markwon:ext-strikethrough:4.6.2
+| +--- io.noties.markwon:core:4.6.2 (*)
@ -524,7 +524,7 @@
+| +--- io.noties.markwon:core:4.6.2 (*)
+| \--- com.atlassian.commonmark:commonmark-ext-gfm-tables:0.13.0
+| \--- com.atlassian.commonmark:commonmark:0.13.0
++--- io.noties.markwon:linkify:4.6.2
++--- io.noties.markwon:ext-tasklist:4.6.2
+| \--- io.noties.markwon:core:4.6.2 (*)
++--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0 (*)
++--- com.squareup.okhttp3:okhttp:4.10.0 (*)
@ -588,7 +588,6 @@
+| +--- com.google.http-client:google-http-client:1.39.2 (*)
+| +--- com.google.http-client:google-http-client-gson:1.39.2 (*)
+| \--- com.google.guava:guava:30.1.1-android (*)
++--- androidx.work:work-runtime:2.7.1 (*)
++--- androidx.work:work-runtime-ktx:2.7.1
+| +--- androidx.work:work-runtime:2.7.1 (*)
+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.5.30 -> 1.8.0 (*)

@ -0,0 +1,96 @@
[versions]
accompanist = "0.24.12-rc"
analytics = "20.1.0"
coil = "2.2.0"
compose = "2023.01.00"
compose-compiler = "1.4.0"
compose-theme-adapter = "1.1.11"
crashlytics = "18.2.11"
dagger-hilt = "2.44.2"
flipper = "0.177.0"
hilt = "1.0.0"
kotlin = "1.8.0"
leakcanary = "2.10"
lifecycle = "2.4.1"
make-it-easy = "4.0.1"
markwon = "4.6.2"
mockito = "3.9.0"
okhttp = "4.10.0"
remote-config = "21.0.1"
retrofit = "2.9.0"
room = "2.4.2"
soloader = "0.10.5"
work = "2.7.1"
androidx-test = "1.3.0"
[libraries]
accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
androidx-compose = { module = "androidx.compose:compose-bom", version.ref = "compose" }
androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hilt" }
androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "hilt" }
androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
androidx-room = { module = "androidx.room:room-ktx", version.ref = "room" }
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room"}
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test" }
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test" }
androidx-work = { module = "androidx.work:work-runtime-ktx", version.ref = "work" }
coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
coil-svg = { module = "io.coil-kt:coil-svg", version.ref = "coil" }
coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil" }
compose-theme-adapter = { module = "com.google.android.material:compose-theme-adapter", version.ref = "compose-theme-adapter" }
dagger-hilt = { module = "com.google.dagger:hilt-android", version.ref = "dagger-hilt" }
dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger-hilt" }
dagger-hilt-testing = { module = "com.google.dagger:hilt-android-testing", version.ref = "dagger-hilt" }
facebook-flipper = { module = "com.facebook.flipper:flipper", version.ref = "flipper" }
facebook-flipper-network = { module = "com.facebook.flipper:flipper-network-plugin", version.ref = "flipper" }
facebook-soloader = { module = "com.facebook.soloader:soloader", version.ref = "soloader" }
firebase-analytics = { module = "com.google.firebase:firebase-analytics", version.ref = "analytics" }
firebase-config = { module = "com.google.firebase:firebase-config-ktx", version.ref = "remote-config" }
firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics", version.ref = "crashlytics" }
kotlin-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
leakcanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
make-it-easy = { module = "com.natpryce:make-it-easy", version.ref = "make-it-easy" }
markwon = { module = "io.noties.markwon:core", version.ref = "markwon" }
markwon-editor = { module = "io.noties.markwon:editor", version.ref = "markwon" }
markwon-linkify = { module = "io.noties.markwon:linkify", version.ref = "markwon" }
markwon-strikethrough = { module = "io.noties.markwon:ext-strikethrough", version.ref = "markwon" }
markwon-tables = { module = "io.noties.markwon:ext-tables", version.ref = "markwon" }
markwon-tasklist = { module = "io.noties.markwon:ext-tasklist", version.ref = "markwon" }
mockito-android = { module = "org.mockito:mockito-android", version.ref = "mockito" }
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp" }
retrofit = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
retrofit-moshi = { module = "com.squareup.retrofit2:converter-moshi", version.ref = "retrofit" }
[bundles]
coil = [
"coil-compose",
"coil-video",
"coil-svg",
"coil-gif",
]
flipper = [
"facebook-flipper",
"facebook-flipper-network",
"facebook-soloader",
]
markwon = [
"markwon",
"markwon-editor",
"markwon-linkify",
"markwon-strikethrough",
"markwon-tables",
"markwon-tasklist",
]
retrofit = [
"retrofit",
"retrofit-moshi",
]
[plugins]
Loading…
Cancel
Save