Replace `dependencies.gradle` with `libs.versions.toml`
diff --git a/build.gradle b/build.gradle
index 5887e3b..ba4e2d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,8 +45,6 @@
apply from: 'gradle/mockito-core/javadoc.gradle'
apply from: 'gradle/mockito-core/testing.gradle'
-apply from: 'gradle/dependencies.gradle'
-
allprojects { proj ->
repositories {
mavenCentral()
@@ -90,14 +88,14 @@
}
dependencies {
- api libraries.bytebuddy, libraries.bytebuddyagent
+ api libs.bytebuddy, libs.bytebuddy.agent
- compileOnly libraries.junit4, libraries.hamcrest, libraries.opentest4j
- implementation libraries.objenesis
+ compileOnly libs.junit4, libs.hamcrest, libs.opentest4j
+ implementation libs.objenesis
- testImplementation libraries.assertj
- testImplementation libraries.junitJupiterApi
- testImplementation libraries.junitJupiterParams
+ testImplementation libs.assertj
+ testImplementation libs.junit.jupiter.api
+ testImplementation libs.junit.jupiter.params
testUtil sourceSets.test.output
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
deleted file mode 100644
index 4203fb2..0000000
--- a/gradle/dependencies.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-ext {
- libraries = [:]
-}
-
-def versions = [:]
-
-versions.bytebuddy = '1.15.0'
-versions.junitJupiter = '5.11.0'
-versions.errorprone = '2.23.0'
-
-libraries.junit4 = 'junit:junit:4.13.2'
-libraries.junitJupiterApi = "org.junit.jupiter:junit-jupiter-api:${versions.junitJupiter}"
-libraries.junitJupiterParams = "org.junit.jupiter:junit-jupiter-params:${versions.junitJupiter}"
-libraries.junitPlatformLauncher = 'org.junit.platform:junit-platform-launcher:1.11.0'
-libraries.junitJupiterEngine = "org.junit.jupiter:junit-jupiter-engine:${versions.junitJupiter}"
-libraries.junitVintageEngine = "org.junit.vintage:junit-vintage-engine:${versions.junitJupiter}"
-libraries.assertj = 'org.assertj:assertj-core:3.26.3'
-libraries.hamcrest = 'org.hamcrest:hamcrest-core:3.0'
-libraries.opentest4j = 'org.opentest4j:opentest4j:1.3.0'
-
-libraries.bytebuddy = "net.bytebuddy:byte-buddy:${versions.bytebuddy}"
-libraries.bytebuddyagent = "net.bytebuddy:byte-buddy-agent:${versions.bytebuddy}"
-libraries.bytebuddyandroid = "net.bytebuddy:byte-buddy-android:${versions.bytebuddy}"
-
-libraries.errorprone = "com.google.errorprone:error_prone_core:${versions.errorprone}"
-libraries.errorproneTestApi = "com.google.errorprone:error_prone_test_helpers:${versions.errorprone}"
-
-libraries.autoservice = "com.google.auto.service:auto-service:1.1.1"
-
-libraries.objenesis = 'org.objenesis:objenesis:3.3'
-
-libraries.osgi = 'org.osgi:osgi.core:8.0.0'
-libraries.equinox = 'org.eclipse.platform:org.eclipse.osgi:3.20.0'
-libraries.bndGradle = 'biz.aQute.bnd:biz.aQute.bnd.gradle:6.4.0'
-
-libraries.groovy = 'org.codehaus.groovy:groovy:3.0.22'
-
-def kotlinVersion = '2.0.20'
-libraries.kotlin = [
- version: kotlinVersion,
-
- stdlib: "org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}",
- coroutines: 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3-native-mt',
-]
-libraries.android = [
- runner: 'androidx.test:runner:1.6.2',
- junit: 'androidx.test.ext:junit:1.2.1',
-]
diff --git a/gradle/errorprone.gradle b/gradle/errorprone.gradle
index d7d5514..d3066e9 100644
--- a/gradle/errorprone.gradle
+++ b/gradle/errorprone.gradle
@@ -2,5 +2,5 @@
apply plugin: "net.ltgt.errorprone"
dependencies {
- errorprone libraries.errorprone
+ errorprone libs.errorprone
}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..58a3d1e
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,32 @@
+[versions]
+bytebuddy = "1.15.0"
+errorprone = "2.23.0"
+junit-jupiter = "5.11.0"
+junit-platform = "1.11.0"
+kotlin = "2.0.20"
+
+[libraries]
+android-junit = { module = "androidx.test.ext:junit", version = "1.2.1" }
+android-runner = { module = "androidx.test:runner", version = "1.6.2" }
+assertj = { module = "org.assertj:assertj-core", version = "3.26.3" }
+autoservice = { module = "com.google.auto.service:auto-service", version = "1.1.1" }
+bnd-gradle = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version = "6.4.0" }
+bytebuddy = { module = "net.bytebuddy:byte-buddy", version.ref = "bytebuddy" }
+bytebuddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "bytebuddy" }
+bytebuddy-android = { module = "net.bytebuddy:byte-buddy-android", version.ref = "bytebuddy" }
+equinox = { module = "org.eclipse.platform:org.eclipse.osgi", version = "3.20.0" }
+errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
+errorprone-test-api = { module = "com.google.errorprone:error_prone_test_helpers", version.ref = "errorprone" }
+groovy = { module = "org.codehaus.groovy:groovy", version = "3.0.22" }
+hamcrest = { module = "org.hamcrest:hamcrest-core", version = "3.0" }
+junit4 = { module = "junit:junit", version = "4.13.2" }
+junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
+junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }
+junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit-jupiter" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.3-native-mt" }
+objenesis = { module = "org.objenesis:objenesis", version = "3.3" }
+opentest4j = { module = "org.opentest4j:opentest4j", version = "1.3.0" }
+osgi = { module = "org.osgi:osgi.core", version = "8.0.0" }
diff --git a/gradle/mockito-junit-jupiter/javadoc.gradle b/gradle/mockito-junit-jupiter/javadoc.gradle
index 73f4afd..2b2f642 100644
--- a/gradle/mockito-junit-jupiter/javadoc.gradle
+++ b/gradle/mockito-junit-jupiter/javadoc.gradle
@@ -37,7 +37,7 @@
// https://bugs.openjdk.org/browse/JDK-8274639
if (JavaVersion.current() >= JavaVersion.VERSION_18) {
options.addStringOption('-link-modularity-mismatch', 'info')
- options.links("https://junit.org/junit5/docs/5.11.0/api/")
+ options.links("https://junit.org/junit5/docs/${libs.versions.junit.jupiter.get()}/api/")
}
doLast {
diff --git a/subprojects/android/android.gradle b/subprojects/android/android.gradle
index 4527cfd..9f2937d 100644
--- a/subprojects/android/android.gradle
+++ b/subprojects/android/android.gradle
@@ -1,11 +1,10 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-library.gradle"
description = "Mockito for Android"
dependencies {
api project.rootProject
- implementation libraries.bytebuddyandroid
+ implementation libs.bytebuddy.android
}
tasks.javadoc.enabled = false
diff --git a/subprojects/androidTest/androidTest.gradle b/subprojects/androidTest/androidTest.gradle
index 3c73f11..4a136c9 100644
--- a/subprojects/androidTest/androidTest.gradle
+++ b/subprojects/androidTest/androidTest.gradle
@@ -5,7 +5,6 @@
id 'kotlin-android'
}
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/test-launcher.gradle"
android {
@@ -66,7 +65,7 @@
}
dependencies {
- implementation libraries.kotlin.stdlib
+ implementation libs.kotlin.stdlib
// Add :android on the classpath so that AGP's jacoco setup thinks it's "production code to be tested".
// Essentially a way to say: tasks.createDebugAndroidTestCoverageReport.classFileCollection.from(project(":android"))
@@ -75,11 +74,11 @@
configurations.testImplementation { exclude group: 'org.mockito', module: 'android' }
testImplementation project(":")
- testImplementation libraries.junit4
- testImplementation libraries.junitJupiterApi
- testImplementation libraries.junitJupiterEngine
+ testImplementation libs.junit4
+ testImplementation libs.junit.jupiter.api
+ testImplementation libs.junit.jupiter.engine
- androidTestImplementation libraries.android.runner
- androidTestImplementation libraries.android.junit
+ androidTestImplementation libs.android.runner
+ androidTestImplementation libs.android.junit
androidTestImplementation project(":android")
}
diff --git a/subprojects/errorprone/errorprone.gradle b/subprojects/errorprone/errorprone.gradle
index 73c762c..9274933 100644
--- a/subprojects/errorprone/errorprone.gradle
+++ b/subprojects/errorprone/errorprone.gradle
@@ -1,17 +1,16 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-library.gradle"
description = "ErrorProne plugins for Mockito"
dependencies {
- compileOnly libraries.autoservice
- annotationProcessor libraries.autoservice
+ compileOnly libs.autoservice
+ annotationProcessor libs.autoservice
implementation project.rootProject
- implementation libraries.errorprone
+ implementation libs.errorprone
testImplementation 'junit:junit:4.13.2'
- testImplementation libraries.errorproneTestApi
+ testImplementation libs.errorprone.test.api
}
test {
diff --git a/subprojects/extTest/extTest.gradle b/subprojects/extTest/extTest.gradle
index 526b0a7..ac74a70 100644
--- a/subprojects/extTest/extTest.gradle
+++ b/subprojects/extTest/extTest.gradle
@@ -1,4 +1,3 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "End-to-end tests for Mockito and its extensions."
@@ -7,12 +6,12 @@
testImplementation project.rootProject
testImplementation project(":junit-jupiter")
testImplementation project(path: ':', configuration: 'testUtil')
- testImplementation libraries.junit4
- testImplementation libraries.assertj
- testImplementation libraries.junitJupiterApi
- testRuntimeOnly libraries.junitJupiterEngine
- testRuntimeOnly libraries.junitVintageEngine
- testRuntimeOnly libraries.junitPlatformLauncher
+ testImplementation libs.junit4
+ testImplementation libs.assertj
+ testImplementation libs.junit.jupiter.api
+ testRuntimeOnly libs.junit.jupiter.engine
+ testRuntimeOnly libs.junit.vintage.engine
+ testRuntimeOnly libs.junit.platform.launcher
}
tasks.withType(Test).configureEach {
diff --git a/subprojects/groovyInlineTest/groovyInlineTest.gradle b/subprojects/groovyInlineTest/groovyInlineTest.gradle
index 6c822fc..2971076 100644
--- a/subprojects/groovyInlineTest/groovyInlineTest.gradle
+++ b/subprojects/groovyInlineTest/groovyInlineTest.gradle
@@ -2,13 +2,12 @@
id 'groovy'
}
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Integration test for using mockito-inline with Groovy."
dependencies {
testImplementation project(":")
- testImplementation libraries.groovy
- testImplementation libraries.junit4
+ testImplementation libs.groovy
+ testImplementation libs.junit4
}
diff --git a/subprojects/groovyTest/groovyTest.gradle b/subprojects/groovyTest/groovyTest.gradle
index c5023ac..ba0307a 100644
--- a/subprojects/groovyTest/groovyTest.gradle
+++ b/subprojects/groovyTest/groovyTest.gradle
@@ -2,13 +2,12 @@
id 'groovy'
}
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Integration test for using Mockito from Groovy."
dependencies {
testImplementation project(":")
- testImplementation libraries.groovy
- testImplementation libraries.junit4
+ testImplementation libs.groovy
+ testImplementation libs.junit4
}
diff --git a/subprojects/inlineTest/inlineTest.gradle b/subprojects/inlineTest/inlineTest.gradle
index ba232c5..53bf96d 100644
--- a/subprojects/inlineTest/inlineTest.gradle
+++ b/subprojects/inlineTest/inlineTest.gradle
@@ -1,12 +1,11 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Mockito preconfigured inline mock maker (intermediate and to be superseeded by automatic usage in a future version)"
dependencies {
implementation project.rootProject
- testImplementation libraries.junit4
- testImplementation libraries.assertj
+ testImplementation libs.junit4
+ testImplementation libs.assertj
}
test {
diff --git a/subprojects/java21-test/java21-test.gradle b/subprojects/java21-test/java21-test.gradle
index 9a2415d..84d59af 100644
--- a/subprojects/java21-test/java21-test.gradle
+++ b/subprojects/java21-test/java21-test.gradle
@@ -1,12 +1,11 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Test suite for Java 21 Mockito"
dependencies {
implementation project.rootProject
- testImplementation libraries.junit4
- testImplementation libraries.assertj
+ testImplementation libs.junit4
+ testImplementation libs.assertj
}
java {
diff --git a/subprojects/junit-jupiter/junit-jupiter.gradle b/subprojects/junit-jupiter/junit-jupiter.gradle
index 013f2ff..f3b8a94 100644
--- a/subprojects/junit-jupiter/junit-jupiter.gradle
+++ b/subprojects/junit-jupiter/junit-jupiter.gradle
@@ -4,7 +4,6 @@
id 'biz.aQute.bnd.builder'
}
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-library.gradle"
apply from: "$rootDir/gradle/mockito-junit-jupiter/javadoc.gradle"
@@ -13,10 +12,10 @@
dependencies {
api project.rootProject
- implementation libraries.junitJupiterApi
- testImplementation libraries.assertj
- testImplementation libraries.junitPlatformLauncher
- testRuntimeOnly libraries.junitJupiterEngine
+ implementation libs.junit.jupiter.api
+ testImplementation libs.assertj
+ testImplementation libs.junit.platform.launcher
+ testRuntimeOnly libs.junit.jupiter.engine
}
tasks.withType(Test).configureEach {
diff --git a/subprojects/junitJupiterExtensionTest/junitJupiterExtensionTest.gradle b/subprojects/junitJupiterExtensionTest/junitJupiterExtensionTest.gradle
index feb05d1..e87fcfe 100644
--- a/subprojects/junitJupiterExtensionTest/junitJupiterExtensionTest.gradle
+++ b/subprojects/junitJupiterExtensionTest/junitJupiterExtensionTest.gradle
@@ -1,14 +1,13 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "End-to-end tests for automatic registration of MockitoExtension."
dependencies {
testImplementation project(":junit-jupiter")
- testImplementation libraries.assertj
- testImplementation libraries.junitJupiterApi
- testRuntimeOnly libraries.junitJupiterEngine
- testRuntimeOnly libraries.junitPlatformLauncher
+ testImplementation libs.assertj
+ testImplementation libs.junit.jupiter.api
+ testRuntimeOnly libs.junit.jupiter.engine
+ testRuntimeOnly libs.junit.platform.launcher
}
test {
diff --git a/subprojects/junitJupiterInlineMockMakerExtensionTest/junitJupiterInlineMockMakerExtensionTest.gradle b/subprojects/junitJupiterInlineMockMakerExtensionTest/junitJupiterInlineMockMakerExtensionTest.gradle
index 0b35513..bb84929 100644
--- a/subprojects/junitJupiterInlineMockMakerExtensionTest/junitJupiterInlineMockMakerExtensionTest.gradle
+++ b/subprojects/junitJupiterInlineMockMakerExtensionTest/junitJupiterInlineMockMakerExtensionTest.gradle
@@ -1,14 +1,13 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "End-to-end tests for automatic registration of MockitoExtension with the inline mock maker."
dependencies {
testImplementation project(":junit-jupiter")
- testImplementation libraries.assertj
- testImplementation libraries.junitJupiterApi
- testRuntimeOnly libraries.junitJupiterEngine
- testRuntimeOnly libraries.junitPlatformLauncher
+ testImplementation libs.assertj
+ testImplementation libs.junit.jupiter.api
+ testRuntimeOnly libs.junit.jupiter.engine
+ testRuntimeOnly libs.junit.platform.launcher
}
test {
diff --git a/subprojects/junitJupiterParallelTest/junitJupiterParallelTest.gradle b/subprojects/junitJupiterParallelTest/junitJupiterParallelTest.gradle
index 242c809..c2ccab5 100644
--- a/subprojects/junitJupiterParallelTest/junitJupiterParallelTest.gradle
+++ b/subprojects/junitJupiterParallelTest/junitJupiterParallelTest.gradle
@@ -1,13 +1,12 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Tests that require fine tuned parallel settings for JUnit Jupiter (bug #1630)"
dependencies {
- testImplementation libraries.junitJupiterApi
+ testImplementation libs.junit.jupiter.api
testImplementation project(":junit-jupiter")
- testRuntimeOnly libraries.junitJupiterEngine
- testRuntimeOnly libraries.junitPlatformLauncher
+ testRuntimeOnly libs.junit.jupiter.engine
+ testRuntimeOnly libs.junit.platform.launcher
}
test {
diff --git a/subprojects/kotlinReleaseCoroutinesTest/kotlinReleaseCoroutinesTest.gradle b/subprojects/kotlinReleaseCoroutinesTest/kotlinReleaseCoroutinesTest.gradle
index c1f922d..735098c 100644
--- a/subprojects/kotlinReleaseCoroutinesTest/kotlinReleaseCoroutinesTest.gradle
+++ b/subprojects/kotlinReleaseCoroutinesTest/kotlinReleaseCoroutinesTest.gradle
@@ -5,7 +5,6 @@
id 'org.jetbrains.kotlin.jvm'
}
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Kotlin tests for Mockito."
@@ -18,8 +17,8 @@
dependencies {
testImplementation project(":")
- testImplementation libraries.junit4
+ testImplementation libs.junit4
- testImplementation libraries.kotlin.stdlib
- testImplementation libraries.kotlin.coroutines
+ testImplementation libs.kotlin.stdlib
+ testImplementation libs.kotlin.coroutines
}
diff --git a/subprojects/kotlinTest/kotlinTest.gradle b/subprojects/kotlinTest/kotlinTest.gradle
index c1f922d..735098c 100644
--- a/subprojects/kotlinTest/kotlinTest.gradle
+++ b/subprojects/kotlinTest/kotlinTest.gradle
@@ -5,7 +5,6 @@
id 'org.jetbrains.kotlin.jvm'
}
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Kotlin tests for Mockito."
@@ -18,8 +17,8 @@
dependencies {
testImplementation project(":")
- testImplementation libraries.junit4
+ testImplementation libs.junit4
- testImplementation libraries.kotlin.stdlib
- testImplementation libraries.kotlin.coroutines
+ testImplementation libs.kotlin.stdlib
+ testImplementation libs.kotlin.coroutines
}
diff --git a/subprojects/memory-test/memory-test.gradle b/subprojects/memory-test/memory-test.gradle
index 017378c..38d449e 100644
--- a/subprojects/memory-test/memory-test.gradle
+++ b/subprojects/memory-test/memory-test.gradle
@@ -1,12 +1,11 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Test suite memory usage of Mockito"
dependencies {
implementation project.rootProject
- testImplementation libraries.junit4
- testImplementation libraries.assertj
+ testImplementation libs.junit4
+ testImplementation libs.assertj
}
test {
diff --git a/subprojects/module-test/module-test.gradle b/subprojects/module-test/module-test.gradle
index 3f5c9f5..9427014 100644
--- a/subprojects/module-test/module-test.gradle
+++ b/subprojects/module-test/module-test.gradle
@@ -1,10 +1,9 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Test suite for Java 9 modules with Mockito"
dependencies {
implementation project.rootProject
- testImplementation libraries.junit4
- testImplementation libraries.assertj
+ testImplementation libs.junit4
+ testImplementation libs.assertj
}
diff --git a/subprojects/osgi-test/osgi-test-bundles.gradle b/subprojects/osgi-test/osgi-test-bundles.gradle
index 8f56897..24c2578 100644
--- a/subprojects/osgi-test/osgi-test-bundles.gradle
+++ b/subprojects/osgi-test/osgi-test-bundles.gradle
@@ -3,7 +3,7 @@
mavenCentral()
}
dependencies {
- classpath libraries.bndGradle
+ classpath libs.bnd.gradle
}
}
@@ -16,7 +16,7 @@
dependencies {
testBundleImplementation project.rootProject
- testBundleImplementation libraries.junit4
+ testBundleImplementation libs.junit4
testBundleImplementation sourceSets.otherBundle.output
}
diff --git a/subprojects/osgi-test/osgi-test.gradle b/subprojects/osgi-test/osgi-test.gradle
index e1a6c8f..6d90278 100644
--- a/subprojects/osgi-test/osgi-test.gradle
+++ b/subprojects/osgi-test/osgi-test.gradle
@@ -1,4 +1,3 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
apply from: "osgi-test-bundles.gradle"
@@ -6,10 +5,10 @@
dependencies {
testImplementation project.rootProject
- testImplementation libraries.junit4
- testImplementation libraries.osgi
+ testImplementation libs.junit4
+ testImplementation libs.osgi
- testRuntimeOnly libraries.equinox
+ testRuntimeOnly libs.equinox
}
configurations {
@@ -18,8 +17,8 @@
dependencies {
testRuntimeBundles project.rootProject
- testRuntimeBundles libraries.bytebuddy
- testRuntimeBundles libraries.objenesis
+ testRuntimeBundles libs.bytebuddy
+ testRuntimeBundles libs.objenesis
testRuntimeBundles tasks.testBundle.outputs.files
testRuntimeBundles tasks.otherBundle.outputs.files
}
diff --git a/subprojects/programmatic-test/programmatic-test.gradle b/subprojects/programmatic-test/programmatic-test.gradle
index f964296..4825bf1 100644
--- a/subprojects/programmatic-test/programmatic-test.gradle
+++ b/subprojects/programmatic-test/programmatic-test.gradle
@@ -1,12 +1,11 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-test.gradle"
description = "Test suite for excercising programmatic mock maker in Mockito"
dependencies {
implementation project.rootProject
- testImplementation libraries.junit4
- testImplementation libraries.assertj
+ testImplementation libs.junit4
+ testImplementation libs.assertj
}
test {
diff --git a/subprojects/proxy/proxy.gradle b/subprojects/proxy/proxy.gradle
index e68f012..3b82514 100644
--- a/subprojects/proxy/proxy.gradle
+++ b/subprojects/proxy/proxy.gradle
@@ -1,12 +1,11 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-library.gradle"
description = "Mockito preconfigured proxy mock mock maker (to support interfaces without code generation)"
dependencies {
implementation project.rootProject
- testImplementation libraries.junit4
- testImplementation libraries.assertj
+ testImplementation libs.junit4
+ testImplementation libs.assertj
}
tasks.javadoc.enabled = false
diff --git a/subprojects/subclass/subclass.gradle b/subprojects/subclass/subclass.gradle
index 134b396..3b581f5 100644
--- a/subprojects/subclass/subclass.gradle
+++ b/subprojects/subclass/subclass.gradle
@@ -1,12 +1,11 @@
-apply from: "$rootDir/gradle/dependencies.gradle"
apply from: "$rootDir/gradle/java-library.gradle"
description = "Mockito preconfigured subclass mock maker"
dependencies {
api project.rootProject
- testImplementation libraries.junit4
- testImplementation libraries.assertj
+ testImplementation libs.junit4
+ testImplementation libs.assertj
}
tasks.javadoc.enabled = false
