Skip to content

Commit d52de59

Browse files
falhassenglide-copybara-robot
falhassen
authored and
glide-copybara-robot
committed
Migrating version catalog to the TOML format + rewriting the main settings.gradle file in Kotlin DSL to kick off the process. Removed git exec command since we no longer have submodules.
PiperOrigin-RevId: 820305020
1 parent 2ccb524 commit d52de59

File tree

14 files changed

+201
-178
lines changed

14 files changed

+201
-178
lines changed

‎annotation/ksp/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
dependencies {
77
implementation libs.kotlinpoet
88
implementation project(":annotation")
9-
implementation libs.ksp
9+
implementation libs.ksp.api
1010
implementation libs.autoservice.annotations
1111
ksp libs.ksp.autoservice
1212
}

‎build.gradle‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,14 @@ buildscript {
1717
classpath libs.violations
1818
classpath libs.androidx.benchmark.gradle
1919
classpath libs.kotlin.gradle
20-
classpath libs.ksp.gradle
20+
classpath libs.ksp.gradle.plugin
2121
classpath libs.coroutines.binarycompat.gradle
2222
classpath libs.dokka.gradle
2323
classpath libs.vanniktech
2424
classpath 'com.guardsquare:proguard-gradle:' + (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11) ? '7.3.2' : '7.1.0')
2525
}
2626
}
2727

28-
repositories {
29-
google()
30-
mavenCentral()
31-
}
32-
3328
apply plugin: 'binary-compatibility-validator'
3429
apply plugin: 'org.jetbrains.dokka'
3530

@@ -64,14 +59,6 @@ afterEvaluate {
6459
}
6560

6661
subprojects { project ->
67-
repositories {
68-
google()
69-
mavenCentral()
70-
maven {
71-
url "https://oss.sonatype.org/content/repositories/snapshots"
72-
}
73-
gradlePluginPortal()
74-
}
7562

7663
// Exclude packages not intended for public use.
7764
if ([

‎gradle/libs.versions.toml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
[versions]
2+
pmd = "6.0.0"
3+
dagger = "2.47"
4+
compose = "1.5.1"
5+
kotlin = "1.9.20"
6+
mockito = "5.3.1"
7+
retrofit = "2.3.0"
8+
coroutines = "1.8.0"
9+
ksp = "1.9.20-1.0.14"
10+
errorprone = "2.18.0"
11+
min-sdk-version = "14"
12+
target-sdk-version = "32"
13+
androidx-espresso = "3.5.1"
14+
androidx-fragment = "1.6.1"
15+
okhttp-min-sdk-version = "21"
16+
kotlin-compiler-extension = "1.5.5"
17+
androidx-benchmark = "1.2.0-beta05"
18+
compile-sdk-version = 'android-36'
19+
20+
[libraries]
21+
androidx-multidex = { group = "androidx.multidex", name = "multidex", version = "2.0.1" }
22+
autoservice = { group = "com.google.auto.service", name = "auto-service", version = "1.0-rc3" }
23+
autoservice-annotations = { group = "com.google.auto.service", name = "auto-service-annotations", version = "1.0.1" }
24+
android-gradle = { group = "com.android.tools.build", name = "gradle", version = "8.1.1" }
25+
androidx-cardview = { group = "androidx.cardview", name = "cardview", version = "1.0.0" }
26+
androidx-core = { group = "androidx.core", name = "core", version = "1.12.0" }
27+
androidx-annotation = { group = "androidx.annotation", name = "annotation", version = "1.7.1" }
28+
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.6.1" }
29+
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version = "1.12.0" }
30+
androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version = "1.3.6" }
31+
androidx-futures = { group = "androidx.concurrent", name = "concurrent-futures", version = "1.1.0" }
32+
androidx-junit = { group = "androidx.test.ext", name = "junit", version = "1.1.5" }
33+
androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version = "2.8.2" }
34+
androidx-lifecycle-runtime-testing = { group = "androidx.lifecycle", name = "lifecycle-runtime-testing", version = "2.8.2" }
35+
androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version = "1.3.1" }
36+
androidx-test-core = { group = "androidx.test", name = "core", version = "1.4.0" }
37+
androidx-test-ktx = { group = "androidx.test", name = "core-ktx", version = "1.5.0" }
38+
androidx-test-ktx-junit = { group = "androidx.test.ext", name = "junit-ktx", version = "1.1.5" }
39+
androidx-test-rules = { group = "androidx.test", name = "rules", version = "1.4.0" }
40+
androidx-test-runner = { group = "androidx.test", name = "runner", version = "1.4.0" }
41+
androidx-tracing = { group = "androidx.tracing", name = "tracing", version = "1.0.0" }
42+
androidx-vectordrawable = { group = "androidx.vectordrawable", name = "vectordrawable-animated", version = "1.1.0" }
43+
proguard-gradle = { group = "com.guardsquare", name = "proguard-gradle", version = "7.1.0" }
44+
compose-material = { group = "androidx.compose.material", name = "material", version = "1.5.1" }
45+
coroutines-binarycompat-gradle = { group = "org.jetbrains.kotlinx", name = "binary-compatibility-validator", version = "0.18.1" }
46+
cronet = { group = "com.google.android.gms", name = "play-services-cronet", version = "17.0.1" }
47+
dokka-gradle = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version = "1.8.20" }
48+
drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version = "0.25.1" }
49+
errorprone-gradle = { group = "net.ltgt.gradle", name = "gradle-errorprone-plugin", version = "2.0.2" }
50+
findbugs-jsr305 = { group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2" }
51+
guava = { group = "com.google.guava", name = "guava", version = "28.1-android" }
52+
guava-testlib = { group = "com.google.guava", name = "guava-testlib", version = "18.0" }
53+
javapoet = { group = "com.squareup", name = "javapoet", version = "1.9.0" }
54+
junit = { group = "junit", name = "junit", version = "4.13.2" }
55+
kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.12.0" }
56+
ksp-autoservice = { group = "dev.zacsweers.autoservice", name = "auto-service-ksp", version = "1.0.0" }
57+
ksp-compiletesting = { group = "com.github.tschuchortdev", name = "kotlin-compile-testing-ksp", version = "1.6.0" }
58+
mockwebserver = { group = "com.squareup.okhttp3", name = "mockwebserver", version = "3.0.0-RC1" }
59+
okhttp2 = { group = "com.squareup.okhttp", name = "okhttp", version = "2.7.5" }
60+
okhttp3 = { group = "com.squareup.okhttp3", name = "okhttp", version = "3.10.0" }
61+
okhttp4 = { group = "com.squareup.okhttp3", name = "okhttp", version = "4.10.0" }
62+
robolectric = { group = "org.robolectric", name = "robolectric", version = "4.11.1" }
63+
rx-android = { group = "io.reactivex", name = "rxandroid", version = "1.2.1" }
64+
rx-java = { group = "io.reactivex", name = "rxjava", version = "1.3.8" }
65+
svg = { group = "com.caverock", name = "androidsvg", version = "1.2.1" }
66+
truth = { group = "com.google.truth", name = "truth", version = "1.4.4" }
67+
violations = { group = "se.bjurr.violations", name = "violations-gradle-plugin", version = "1.8" }
68+
volley = { group = "com.android.volley", name = "volley", version = "1.2.1" }
69+
vanniktech = { group = "com.vanniktech", name = "gradle-maven-publish-plugin", version = "0.34.0" }
70+
androidx-benchmark-gradle = { group = "androidx.benchmark", name = "benchmark-gradle-plugin", version.ref = "androidx-benchmark" }
71+
androidx-benchmark-junit = { group = "androidx.benchmark", name = "benchmark-junit4", version.ref = "androidx-benchmark" }
72+
androidx-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-espresso" }
73+
androidx-espresso-idling = { group = "androidx.test.espresso.idling", name = "idling-concurrent", version.ref = "androidx-espresso" }
74+
androidx-fragment = { group = "androidx.fragment", name = "fragment", version.ref = "androidx-fragment" }
75+
androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "androidx-fragment" }
76+
compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "compose" }
77+
compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
78+
compose-ui-testmanifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "compose" }
79+
compose-ui-testjunit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", version.ref = "compose" }
80+
coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
81+
coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
82+
coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
83+
dagger-runtime = { group = "com.google.dagger", name = "dagger", version.ref = "dagger" }
84+
dagger-compiler = { group = "com.google.dagger", name = "dagger-compiler", version.ref = "dagger" }
85+
dagger-android = { group = "com.google.dagger", name = "dagger-android", version.ref = "dagger" }
86+
dagger-android-processor = { group = "com.google.dagger", name = "dagger-android-processor", version.ref = "dagger" }
87+
errorprone-annotations = { group = "com.google.errorprone", name = "error_prone_annotations", version.ref = "errorprone" }
88+
errorprone-core = { group = "com.google.errorprone", name = "error_prone_core", version.ref = "errorprone" }
89+
kotlin-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
90+
kotlin-jdk7 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk7", version.ref = "kotlin" }
91+
kotlin-gradle = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
92+
kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
93+
kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }
94+
ksp-api = { group = "com.google.devtools.ksp", name = "symbol-processing-api", version.ref = "ksp" }
95+
ksp-gradle-plugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
96+
mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
97+
mockito-android = { group = "org.mockito", name = "mockito-android", version.ref = "mockito" }
98+
retrofit-runtime = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
99+
retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }
100+
retrofit-rxjava = { group = "com.squareup.retrofit2", name = "adapter-rxjava", version.ref = "retrofit" }

‎integration/cronet/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies {
1212
testImplementation libs.truth
1313
testImplementation libs.junit
1414
testImplementation libs.robolectric
15-
testImplementation libs.mockito
15+
testImplementation libs.mockito.core
1616
}
1717

1818
android {

‎integration/gifencoder/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies {
66
testImplementation project(":testutil")
77
testImplementation libs.truth
88
testImplementation libs.junit
9-
testImplementation libs.mockito
9+
testImplementation libs.mockito.core
1010
testImplementation libs.robolectric
1111
testImplementation libs.androidx.test.core
1212
testImplementation libs.androidx.junit

‎integration/sqljournaldiskcache/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
testImplementation libs.guava.testlib
2828
testImplementation libs.truth
2929
testImplementation libs.junit
30-
testImplementation libs.mockito
30+
testImplementation libs.mockito.core
3131
testImplementation libs.robolectric
3232
testImplementation libs.androidx.test.core
3333
testImplementation libs.androidx.junit

‎integration/volley/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
testImplementation project(":testutil")
1010
testImplementation libs.truth
1111
testImplementation libs.junit
12-
testImplementation libs.mockito
12+
testImplementation libs.mockito.core
1313
testImplementation libs.robolectric
1414
testImplementation libs.mockwebserver
1515
testImplementation libs.androidx.test.core

‎library/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
testImplementation libs.guava.testlib
2828
testImplementation libs.truth
2929
testImplementation libs.junit
30-
testImplementation libs.mockito
30+
testImplementation libs.mockito.core
3131
testImplementation libs.robolectric
3232
testImplementation libs.mockwebserver
3333
testImplementation libs.androidx.test.core

‎library/test/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
testImplementation libs.guava.testlib
99
testImplementation libs.truth
1010
testImplementation libs.junit
11-
testImplementation libs.mockito
11+
testImplementation libs.mockito.core
1212
testImplementation libs.robolectric
1313
testImplementation libs.mockwebserver
1414
testImplementation libs.androidx.test.core

‎mocks/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies {
44
implementation project(':library')
55
implementation libs.androidx.annotation
66
implementation libs.guava
7-
implementation libs.mockito
7+
implementation libs.mockito.core
88
}
99

1010
android {

0 commit comments

Comments
 (0)