Moved back to Gradle 6.8.3. Moved from the library java to java-library, upgrading the compile, runtime, testRuntime and testCompile configurations as per https://docs.gradle.org/current/userguide/upgrading_version_6.html

mperry · mperry · commit 232d296d0c08 · 2022-02-12T02:53:35.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
     }
 
     wrapper {
-        gradleVersion = "7.4"
+        gradleVersion = "6.8.3"
         distributionType = Wrapper.DistributionType.ALL
     }
 }
@@ -94,7 +94,7 @@ subprojects {
     }
 
     apply from: "$rootDir/lib.gradle"
-	apply plugin: "java"
+	apply plugin: "java-library"
 	apply plugin: "eclipse"
 
 	repositories {
diff --git a/consume/build.gradle b/consume/build.gradle
@@ -2,8 +2,8 @@
 archivesBaseName = "${project.projectName}-${project.name}"
 
 dependencies {
-    compile("$group:$projectName:$fjConsumeVersion")
+    api "$group:$projectName:$fjConsumeVersion"
 
-    testCompile junitCompile
-    testRuntime junitRuntime
+    testImplementation junitCompile
+    testRuntimeOnly junitRuntime
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -6,10 +6,10 @@ ext {
 archivesBaseName = project.projectName
 
 dependencies {
-    testCompile junitCompile
-    testRuntime junitRuntime
-    testCompile 'com.h2database:h2:2.1.210'
-    testCompile 'commons-dbutils:commons-dbutils:1.7'
+    testImplementation junitCompile
+    testRuntimeOnly junitRuntime
+    testImplementation 'com.h2database:h2:2.1.210'
+    testImplementation 'commons-dbutils:commons-dbutils:1.7'
 }
 
 performSigning(signingEnabled, signModule)
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -6,10 +6,10 @@ mainClassName = "fj.demo.euler.Problem2"
 archivesBaseName = "${project.projectName}-${project.name}"
 
 dependencies {
-    compile project(":core")
-    compile project(":quickcheck")
-    testCompile junitCompile
-    testRuntime junitRuntime
+    api project(":core")
+    api project(":quickcheck")
+    api junitCompile
+    testImplementation junitRuntime
 }
 
 test {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/java-core/build.gradle b/java-core/build.gradle
@@ -6,9 +6,9 @@ ext {
 }
 
 dependencies {
-    compile project(":core")
-    testCompile junitCompile
-    testRuntime junitRuntime
+    api project(":core")
+    testImplementation junitCompile
+    testRuntimeOnly junitRuntime
 }
 
 performSigning(signingEnabled, signModule)
diff --git a/performance/build.gradle b/performance/build.gradle
@@ -1,6 +1,6 @@
 
 dependencies {
-    compile project(":core")
-    testCompile junitCompile
-    testRuntime junitRuntime
+    api project(":core")
+    testImplementation junitCompile
+    testRuntimeOnly junitRuntime
 }
diff --git a/props-core-scalacheck/build.gradle b/props-core-scalacheck/build.gradle
@@ -11,12 +11,12 @@ ext {
 }
 
 dependencies {
-    compile project(":core")
-    compile "org.scala-lang:scala-library:$scalaVersion"
-    compile "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"
+    api project(":core")
+    api "org.scala-lang:scala-library:$scalaVersion"
+    api "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"
 
-    testCompile junitCompile
-    testRuntime junitRuntime
+    testImplementation junitCompile
+    testRuntimeOnly junitRuntime
 }
 
 tasks.withType(ScalaCompile) {
diff --git a/props-core/build.gradle b/props-core/build.gradle
@@ -2,7 +2,7 @@
 archivesBaseName = "${project.projectName}-${project.name}"
 
 dependencies {
-    compile project(":quickcheck")
-    testCompile junitCompile
-    testRuntime junitRuntime
+    api project(":quickcheck")
+    testImplementation junitCompile
+    testRuntimeOnly junitRuntime
 }
diff --git a/quickcheck/build.gradle b/quickcheck/build.gradle
@@ -6,8 +6,8 @@ ext {
 archivesBaseName = "${project.projectName}-${project.name}"
 
 dependencies {
-	compile project(":core")
-    compile junitCompile
+    api project(":core")
+    api junitCompile
 }
 
 performSigning(signingEnabled, signModule)

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ buildscript {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`wrapper {`
`19`		`- gradleVersion = "7.4"`
	`19`	`+ gradleVersion = "6.8.3"`
`20`	`20`	`distributionType = Wrapper.DistributionType.ALL`
`21`	`21`	`}`
`22`	`22`	`}`
`@@ -94,7 +94,7 @@ subprojects {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`apply from: "$rootDir/lib.gradle"`
`97`		`- apply plugin: "java"`
	`97`	`+ apply plugin: "java-library"`
`98`	`98`	`apply plugin: "eclipse"`
`99`	`99`
`100`	`100`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ ext {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- compile project(":core")`
`10`		`- testCompile junitCompile`
`11`		`- testRuntime junitRuntime`
	`9`	`+ api project(":core")`
	`10`	`+ testImplementation junitCompile`
	`11`	`+ testRuntimeOnly junitRuntime`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`performSigning(signingEnabled, signModule)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`
`2`	`2`	`dependencies {`
`3`		`- compile project(":core")`
`4`		`- testCompile junitCompile`
`5`		`- testRuntime junitRuntime`
	`3`	`+ api project(":core")`
	`4`	`+ testImplementation junitCompile`
	`5`	`+ testRuntimeOnly junitRuntime`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ ext {`
`6`	`6`	`archivesBaseName = "${project.projectName}-${project.name}"`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- compile project(":core")`
`10`		`- compile junitCompile`
	`9`	`+ api project(":core")`
	`10`	`+ api junitCompile`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`performSigning(signingEnabled, signModule)`