Skip to content

Commit 9a7e7ea

Browse files
scordioTimvdLippe
scordio
authored and
TimvdLippe
committed
Replace dependencies.gradle with libs.versions.toml 
1 parent 1b7675c commit 9a7e7ea

File tree

26 files changed

+103
-141
lines changed

26 files changed

+103
-141
lines changed

‎build.gradle

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ apply from: 'gradle/mockito-core/osgi.gradle'
4545
apply from: 'gradle/mockito-core/javadoc.gradle'
4646
apply from: 'gradle/mockito-core/testing.gradle'
4747

48-
apply from: 'gradle/dependencies.gradle'
49-
5048
allprojects { proj ->
5149
repositories {
5250
mavenCentral()
@@ -90,14 +88,14 @@ configurations {
9088
}
9189

9290
dependencies {
93-
api libraries.bytebuddy, libraries.bytebuddyagent
91+
api libs.bytebuddy, libs.bytebuddy.agent
9492

95-
compileOnly libraries.junit4, libraries.hamcrest, libraries.opentest4j
96-
implementation libraries.objenesis
93+
compileOnly libs.junit4, libs.hamcrest, libs.opentest4j
94+
implementation libs.objenesis
9795

98-
testImplementation libraries.assertj
99-
testImplementation libraries.junitJupiterApi
100-
testImplementation libraries.junitJupiterParams
96+
testImplementation libs.assertj
97+
testImplementation libs.junit.jupiter.api
98+
testImplementation libs.junit.jupiter.params
10199

102100
testUtil sourceSets.test.output
103101

‎gradle/dependencies.gradle

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎gradle/errorprone.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
apply plugin: "net.ltgt.errorprone"
33

44
dependencies {
5-
errorprone libraries.errorprone
5+
errorprone libs.errorprone
66
}

‎gradle/libs.versions.toml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[versions]
2+
bytebuddy = "1.15.0"
3+
errorprone = "2.23.0"
4+
junit-jupiter = "5.11.0"
5+
junit-platform = "1.11.0"
6+
kotlin = "2.0.20"
7+
8+
[libraries]
9+
android-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
10+
android-runner = { module = "androidx.test:runner", version = "1.6.2" }
11+
assertj = { module = "org.assertj:assertj-core", version = "3.26.3" }
12+
autoservice = { module = "com.google.auto.service:auto-service", version = "1.1.1" }
13+
bnd-gradle = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version = "6.4.0" }
14+
bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
15+
bytebuddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "bytebuddy" }
16+
bytebuddy-android = { module = "net.bytebuddy:byte-buddy-android", version.ref = "bytebuddy" }
17+
equinox = { module = "org.eclipse.platform:org.eclipse.osgi", version = "3.20.0" }
18+
errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
19+
errorprone-test-api = { module = "com.google.errorprone:error_prone_test_helpers", version.ref = "errorprone" }
20+
groovy = { module = "org.codehaus.groovy:groovy", version = "3.0.22" }
21+
hamcrest = { module = "org.hamcrest:hamcrest-core", version = "3.0" }
22+
junit4 = { module = "junit:junit", version = "4.13.2" }
23+
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
24+
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
25+
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
26+
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
27+
junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit-jupiter" }
28+
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
29+
kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.3-native-mt" }
30+
objenesis = { module = "org.objenesis:objenesis", version = "3.3" }
31+
opentest4j = { module = "org.opentest4j:opentest4j", version = "1.3.0" }
32+
osgi = { module = "org.osgi:osgi.core", version = "8.0.0" }

‎gradle/mockito-junit-jupiter/javadoc.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ tasks.named("javadoc", Javadoc) {
3737
// https://bugs.openjdk.org/browse/JDK-8274639
3838
if (JavaVersion.current() >= JavaVersion.VERSION_18) {
3939
options.addStringOption('-link-modularity-mismatch', 'info')
40-
options.links("https://junit.org/junit5/docs/5.11.0/api/")
40+
options.links("https://junit.org/junit5/docs/${libs.versions.junit.jupiter.get()}/api/")
4141
}
4242

4343
doLast {

‎subprojects/android/android.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
apply from: "$rootDir/gradle/dependencies.gradle"
21
apply from: "$rootDir/gradle/java-library.gradle"
32

43
description = "Mockito for Android"
54

65
dependencies {
76
api project.rootProject
8-
implementation libraries.bytebuddyandroid
7+
implementation libs.bytebuddy.android
98
}
109

1110
tasks.javadoc.enabled = false

‎subprojects/androidTest/androidTest.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55
id 'kotlin-android'
66
}
77

8-
apply from: "$rootDir/gradle/dependencies.gradle"
98
apply from: "$rootDir/gradle/test-launcher.gradle"
109

1110
android {
@@ -66,7 +65,7 @@ androidComponents {
6665
}
6766

6867
dependencies {
69-
implementation libraries.kotlin.stdlib
68+
implementation libs.kotlin.stdlib
7069

7170
// Add :android on the classpath so that AGP's jacoco setup thinks it's "production code to be tested".
7271
// Essentially a way to say: tasks.createDebugAndroidTestCoverageReport.classFileCollection.from(project(":android"))
@@ -75,11 +74,11 @@ dependencies {
7574
configurations.testImplementation { exclude group: 'org.mockito', module: 'android' }
7675

7776
testImplementation project(":")
78-
testImplementation libraries.junit4
79-
testImplementation libraries.junitJupiterApi
80-
testImplementation libraries.junitJupiterEngine
77+
testImplementation libs.junit4
78+
testImplementation libs.junit.jupiter.api
79+
testImplementation libs.junit.jupiter.engine
8180

82-
androidTestImplementation libraries.android.runner
83-
androidTestImplementation libraries.android.junit
81+
androidTestImplementation libs.android.runner
82+
androidTestImplementation libs.android.junit
8483
androidTestImplementation project(":android")
8584
}

‎subprojects/errorprone/errorprone.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
apply from: "$rootDir/gradle/dependencies.gradle"
21
apply from: "$rootDir/gradle/java-library.gradle"
32

43
description = "ErrorProne plugins for Mockito"
54

65
dependencies {
7-
compileOnly libraries.autoservice
8-
annotationProcessor libraries.autoservice
6+
compileOnly libs.autoservice
7+
annotationProcessor libs.autoservice
98

109
implementation project.rootProject
11-
implementation libraries.errorprone
10+
implementation libs.errorprone
1211

1312
testImplementation 'junit:junit:4.13.2'
14-
testImplementation libraries.errorproneTestApi
13+
testImplementation libs.errorprone.test.api
1514
}
1615

1716
test {

‎subprojects/extTest/extTest.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
apply from: "$rootDir/gradle/dependencies.gradle"
21
apply from: "$rootDir/gradle/java-test.gradle"
32

43
description = "End-to-end tests for Mockito and its extensions."
@@ -7,12 +6,12 @@ dependencies {
76
testImplementation project.rootProject
87
testImplementation project(":junit-jupiter")
98
testImplementation project(path: ':', configuration: 'testUtil')
10-
testImplementation libraries.junit4
11-
testImplementation libraries.assertj
12-
testImplementation libraries.junitJupiterApi
13-
testRuntimeOnly libraries.junitJupiterEngine
14-
testRuntimeOnly libraries.junitVintageEngine
15-
testRuntimeOnly libraries.junitPlatformLauncher
9+
testImplementation libs.junit4
10+
testImplementation libs.assertj
11+
testImplementation libs.junit.jupiter.api
12+
testRuntimeOnly libs.junit.jupiter.engine
13+
testRuntimeOnly libs.junit.vintage.engine
14+
testRuntimeOnly libs.junit.platform.launcher
1615
}
1716

1817
tasks.withType(Test).configureEach {

‎subprojects/groovyInlineTest/groovyInlineTest.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ plugins {
22
id 'groovy'
33
}
44

5-
apply from: "$rootDir/gradle/dependencies.gradle"
65
apply from: "$rootDir/gradle/java-test.gradle"
76

87
description = "Integration test for using mockito-inline with Groovy."
98

109
dependencies {
1110
testImplementation project(":")
12-
testImplementation libraries.groovy
13-
testImplementation libraries.junit4
11+
testImplementation libs.groovy
12+
testImplementation libs.junit4
1413
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy