Skip to content

Commit

Permalink
Enable version catalogs
Browse files Browse the repository at this point in the history
  • Loading branch information
ganadist authored and utzcoz committed May 7, 2023
1 parent 02523be commit 74955d1
Show file tree
Hide file tree
Showing 42 changed files with 407 additions and 257 deletions.
2 changes: 1 addition & 1 deletion annotations/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ apply plugin: RoboJavaModulePlugin
apply plugin: DeployedRoboJavaModulePlugin

dependencies {
compileOnly "com.google.code.findbugs:jsr305:3.0.2"
compileOnly libs.findbugs.jsr305
compileOnly AndroidSdk.MAX_SDK.coordinates
}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ buildscript {

dependencies {
gradle
classpath 'com.android.tools.build:gradle:7.4.2'
classpath libs.android.gradle
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:3.1.0'
classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.18.0"
classpath libs.kotlin.gradle
classpath libs.spotless.gradle
}
}

Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ dependencies {
implementation gradleApi()
implementation localGroovy()

api "com.google.guava:guava:31.1-jre"
api libs.guava
api 'org.jetbrains:annotations:24.0.1'
implementation "org.ow2.asm:asm-tree:9.5"
implementation 'com.android.tools.build:gradle:7.4.2'
implementation libs.asm.tree
implementation libs.android.gradle
}
7 changes: 7 additions & 0 deletions buildSrc/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class RoboJavaModulePlugin implements Plugin<Project> {
if (!skipErrorprone) {
apply plugin: "net.ltgt.errorprone"
project.dependencies {
errorprone("com.google.errorprone:error_prone_core:$errorproneVersion")
errorproneJavac("com.google.errorprone:javac:$errorproneJavacVersion")
errorprone(libs.error.prone.core)
errorproneJavac(libs.error.prone.javac)
}
}

Expand Down
47 changes: 9 additions & 38 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,40 +1,11 @@
ext {
apiCompatVersion='4.10'

errorproneVersion='2.18.0'
errorproneJavacVersion='9+181-r4173-1'

// AndroidX test versions
axtMonitorVersion='1.6.1'
axtRunnerVersion='1.5.2'
axtRulesVersion='1.5.0'
axtCoreVersion='1.5.0'
axtTruthVersion='1.5.0'
espressoVersion='3.5.1'
axtJunitVersion='1.1.5'
axtTestServicesVersion='1.4.2'

// AndroidX versions
coreVersion='1.10.0'
appCompatVersion='1.6.1'
constraintlayoutVersion='2.1.4'
windowVersion='1.0.0'
fragmentVersion='1.5.7'

truthVersion='1.1.3'

junitVersion='4.13.2'

mockitoVersion='4.11.0'

jacocoVersion='0.8.8'

guavaJREVersion='31.1-jre'

asmVersion='9.5'

kotlinVersion='1.8.10'
autoServiceVersion='1.0.1'
multidexVersion='2.0.1'
sqlite4javaVersion='1.0.392'
apiCompatVersion = '4.10'

// https://github.com/gradle/gradle/issues/21267
axtCoreVersion = libs.versions.androidx.test.core.get()
axtJunitVersion = libs.versions.androidx.test.ext.junit.get()
axtMonitorVersion = libs.versions.androidx.test.monitor.get()
axtRunnerVersion = libs.versions.androidx.test.runner.get()
axtTruthVersion = libs.versions.androidx.test.ext.truth.get()
espressoVersion = libs.versions.androidx.test.espresso.get()
}
18 changes: 9 additions & 9 deletions errorprone/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ dependencies {
implementation project(":shadowapi")

// Compile dependencies
implementation "com.google.errorprone:error_prone_annotation:$errorproneVersion"
implementation "com.google.errorprone:error_prone_refaster:$errorproneVersion"
implementation "com.google.errorprone:error_prone_check_api:$errorproneVersion"
compileOnly "com.google.auto.service:auto-service-annotations:$autoServiceVersion"
implementation libs.error.prone.annotations
implementation libs.error.prone.refaster
implementation libs.error.prone.check.api
compileOnly libs.auto.service.annotations
compileOnly(AndroidSdk.MAX_SDK.coordinates)

annotationProcessor "com.google.auto.service:auto-service:$autoServiceVersion"
annotationProcessor "com.google.errorprone:error_prone_core:$errorproneVersion"
annotationProcessor libs.auto.service
annotationProcessor libs.error.prone.core

// in jdk 9, tools.jar disappears!
def toolsJar = Jvm.current().getToolsJar()
Expand All @@ -36,9 +36,9 @@ dependencies {
}

// Testing dependencies
testImplementation "junit:junit:${junitVersion}"
testImplementation "com.google.truth:truth:${truthVersion}"
testImplementation("com.google.errorprone:error_prone_test_helpers:${errorproneVersion}") {
testImplementation libs.junit4
testImplementation libs.truth
testImplementation(libs.error.prone.test.helpers) {
exclude group: 'junit', module: 'junit' // because it depends on a snapshot!?
}
testCompileOnly(AndroidSdk.MAX_SDK.coordinates)
Expand Down
166 changes: 166 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
[versions]
# https://developer.android.com/studio/releases
android-gradle = "7.4.2"

# https://github.com/google/conscrypt/tags
conscrypt = "2.5.2"

# https://github.com/bcgit/bc-java/tags
bouncycastle = "1.73"

# https://github.com/findbugsproject/findbugs/tags
findbugs-jsr305 = "3.0.2"

# https://github.com/hamcrest/JavaHamcrest/releases
hamcrest = "2.0.0.0"

# https://github.com/google/error-prone/releases
error-prone = "2.18.0"
error-prone-javac = "9+181-r4173-1"

# https://kotlinlang.org/docs/releases.html#release-details
kotlin = "1.8.10"

# https://github.com/diffplug/spotless/blob/main/CHANGES.md
spotless-gradle = "6.18.0"

# https://asm.ow2.io/versions.html
asm = "9.5"

# https://github.com/google/auto/releases
auto-common = "1.2.1"
auto-service = "1.0.1"
auto-value = "1.10.1"

compile-testing = "0.21.0"

# https://github.com/google/guava/releases
guava-jre = "31.1-jre"

# https://github.com/google/gson/releases
gson = "2.10.1"

# https://github.com/google/truth/releases
truth = "1.1.3"

jacoco = "0.8.8"

# https://junit.org/junit4/
junit4 = "4.13.2"

# https://github.com/mockito/mockito/releases
mockito = "4.11.0"

# https://github.com/mockk/mockk/releases
mockk = "1.13.5"

sqlite4java = "1.0.392"

# https://developer.android.com/jetpack/androidx/versions
androidx-annotation = "1.3.0"
androidx-appcompat = "1.6.1"
androidx-constraintlayout = "2.1.4"
androidx-core = "1.10.0"
androidx-fragment = "1.5.7"
androidx-multidex = "2.0.1"
androidx-window = "1.0.0"

# https://github.com/android/android-test/tags
androidx-test-annotation = "1.0.1"
androidx-test-core = "1.5.0"
androidx-test-espresso = "3.5.1"
androidx-test-ext-junit = "1.1.5"
androidx-test-ext-truth = "1.5.0"
androidx-test-monitor="1.6.1"
androidx-test-orchestrator="1.4.2"
androidx-test-runner = "1.5.2"
androidx-test-services = "1.4.2"


[libraries]
android-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle" }
kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
spotless-gradle = { module = "com.diffplug.spotless:spotless-plugin-gradle", version.ref = "spotless-gradle" }

kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }

auto-common = { module = "com.google.auto:auto-common", version.ref = "auto-common" }
auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "auto-service" }
auto-service = { module = "com.google.auto.service:auto-service", version.ref = "auto-service" }
auto-value-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "auto-value" }
auto-value = { module = "com.google.auto.value:auto-value", version.ref = "auto-value" }

asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
asm-commons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }

compile-testing = { module = "com.google.testing.compile:compile-testing", version.ref = "compile-testing" }

error-prone-core = { module = "com.google.errorprone:error_prone_core", version.ref = "error-prone" }
error-prone-annotations = { module = "com.google.errorprone:error_prone_annotation", version.ref = "error-prone" }
error-prone-refaster= { module = "com.google.errorprone:error_prone_refaster", version.ref = "error-prone" }
error-prone-check-api = { module = "com.google.errorprone:error_prone_check_api", version.ref = "error-prone" }
error-prone-test-helpers = { module = "com.google.errorprone:error_prone_test_helpers", version.ref = "error-prone" }
error-prone-javac = { module = "com.google.errorprone:javac", version.ref = "error-prone-javac" }

conscrypt-openjdk-uber = { module = "org.conscrypt:conscrypt-openjdk-uber", version.ref = "conscrypt" }
bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncycastle" }
findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "findbugs-jsr305" }

guava = { module = "com.google.guava:guava", version.ref = "guava-jre" }
guava-testlib = { module = "com.google.guava:guava-testlib", version.ref = "guava-jre" }
gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
hamcrest-junit = { module = "org.hamcrest:hamcrest-junit", version.ref = "hamcrest" }

jacoco-agent = { module = "org.jacoco:org.jacoco.agent", version.ref = "jacoco" }
junit4 = { module = "junit:junit", version.ref = "junit4" }

sqlite4java = { module = "com.almworks.sqlite4java:sqlite4java", version.ref = "sqlite4java" }
sqlite4java-osx = { module = "com.almworks.sqlite4java:libsqlite4java-osx", version.ref = "sqlite4java" }
sqlite4java-linux-amd64 = { module = "com.almworks.sqlite4java:libsqlite4java-linux-amd64", version.ref = "sqlite4java" }
sqlite4java-win32-x64 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x64", version.ref = "sqlite4java" }
sqlite4java-linux-i386 = { module = "com.almworks.sqlite4java:libsqlite4java-linux-i386", version.ref = "sqlite4java" }
sqlite4java-win32-x86 = { module = "com.almworks.sqlite4java:sqlite4java-win32-x86", version.ref = "sqlite4java" }

truth = { module = "com.google.truth:truth", version.ref = "truth" }
truth-java8-extension = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truth" }

mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "mockito" }
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }

androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidx-fragment" }
androidx-fragment-testing = { module = "androidx.fragment:fragment-testing", version.ref = "androidx-fragment" }
androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "androidx-multidex" }
androidx-window = { module = "androidx.window:window", version.ref = "androidx-window" }

androidx-test-annotation = { module = "androidx.test:annotation", version.ref = "androidx-test-annotation" }
androidx-test-core = { module = "androidx.test:core", version.ref = "androidx-test-core" }
androidx-test-monitor = { module = "androidx.test:monitor", version.ref = "androidx-test-monitor" }
androidx-test-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidx-test-orchestrator" }
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test-core" }
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
androidx-test-services = { module = "androidx.test.services:test-services", version.ref = "androidx-test-services" }
androidx-test-services-storage = { module = "androidx.test.services:storage", version.ref = "androidx-test-services" }

androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
androidx-test-espresso-accessibility = { module = "androidx.test.espresso:espresso-accessibility", version.ref = "androidx-test-espresso" }
androidx-test-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "androidx-test-espresso" }
androidx-test-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "androidx-test-espresso" }
androidx-test-espresso-remote = { module = "androidx.test.espresso:espresso-remote", version.ref = "androidx-test-espresso" }
androidx-test-espresso-web = { module = "androidx.test.espresso:espresso-web", version.ref = "androidx-test-espresso" }

androidx-test-espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "androidx-test-espresso" }
androidx-test-espresso-idling-concurrent = { module = "androidx.test.espresso.idling:idling-concurrent", version.ref = "androidx-test-espresso" }
androidx-test-espresso-idling-net = { module = "androidx.test.espresso.idling:idling-net", version.ref = "androidx-test-espresso" }

androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-ext-junit" }
androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "androidx-test-ext-truth" }


[plugins]
8 changes: 4 additions & 4 deletions integration_tests/agp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies {
testImplementation project(":robolectric")
testImplementation project(":integration_tests:agp:testsupport")

testImplementation "junit:junit:${junitVersion}"
testImplementation("androidx.test:core:$axtCoreVersion")
testImplementation("androidx.test:runner:$axtRunnerVersion")
testImplementation("androidx.test.ext:junit:$axtJunitVersion")
testImplementation libs.junit4
testImplementation libs.androidx.test.core
testImplementation libs.androidx.test.runner
testImplementation libs.androidx.test.ext.junit
}
22 changes: 11 additions & 11 deletions integration_tests/androidx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ android {
}

dependencies {
implementation("androidx.appcompat:appcompat:$appCompatVersion")
implementation("androidx.window:window:$windowVersion")
implementation libs.androidx.appcompat
implementation libs.androidx.window

// Testing dependencies
testImplementation project(path: ':testapp')
testImplementation project(":robolectric")
testImplementation "junit:junit:$junitVersion"
testImplementation("androidx.test:core:$axtCoreVersion")
testImplementation("androidx.core:core:$coreVersion")
testImplementation("androidx.test:runner:$axtRunnerVersion")
testImplementation("androidx.test:rules:$axtRulesVersion")
testImplementation("androidx.test.espresso:espresso-intents:$espressoVersion")
testImplementation("androidx.test.ext:truth:$axtTruthVersion")
testImplementation("androidx.test.ext:junit:$axtJunitVersion")
testImplementation("com.google.truth:truth:$truthVersion")
testImplementation libs.junit4
testImplementation libs.androidx.test.core
testImplementation libs.androidx.core
testImplementation libs.androidx.test.runner
testImplementation libs.androidx.test.rules
testImplementation libs.androidx.test.espresso.intents
testImplementation libs.androidx.test.ext.truth
testImplementation libs.androidx.test.ext.junit
testImplementation libs.truth
}
Loading

0 comments on commit 74955d1

Please sign in to comment.