Bring Gradle to 5.2.1

gliptak · gliptak · commit f85a3698a2b2 · 2019-02-28T21:14:25.000-05:00
Signed-off-by: Gábor Lipták &lt;gliptak@gmail.com&gt;
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     }
 
     wrapper {
-        gradleVersion = "4.10.3"
+        gradleVersion = "5.2.1"
         distributionType = Wrapper.DistributionType.ALL
     }
 }
@@ -69,7 +69,8 @@ allprojects {
         sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl
         primaryEmail = "functionaljava@googlegroups.com"
 
-        dependencyJunit = "org.junit.vintage:junit-vintage-engine:5.3.2"
+        junitCompile = "junit:junit:4.12"
+        junitRuntime = "org.junit.vintage:junit-vintage-engine:5.3.2"
 
         displayCompilerWarnings = true
     }
diff --git a/consume/build.gradle b/consume/build.gradle
@@ -4,5 +4,6 @@ archivesBaseName = "${project.projectName}-${project.name}"
 dependencies {
     compile("$group:$projectName:$fjConsumeVersion")
 
-    testCompile dependencyJunit
+    testCompile junitCompile
+    testRuntime junitRuntime
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -6,7 +6,8 @@ ext {
 archivesBaseName = project.projectName
 
 dependencies {
-    testCompile dependencyJunit
+    testCompile junitCompile
+    testRuntime junitRuntime
     testCompile 'com.h2database:h2:1.4.197'
     testCompile 'commons-dbutils:commons-dbutils:1.7'
 }
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -8,7 +8,8 @@ archivesBaseName = "${project.projectName}-${project.name}"
 dependencies {
     compile project(":core")
     compile project(":quickcheck")
-    testCompile dependencyJunit
+    testCompile junitCompile
+    testRuntime junitRuntime
 }
 
 test {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
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-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/java-core/build.gradle b/java-core/build.gradle
@@ -7,7 +7,8 @@ ext {
 
 dependencies {
     compile project(":core")
-    testCompile dependencyJunit
+    testCompile junitCompile
+    testRuntime junitRuntime
 }
 
 performSigning(signingEnabled, signModule)
diff --git a/performance/build.gradle b/performance/build.gradle
@@ -1,5 +1,6 @@
 
 dependencies {
     compile project(":core")
-    testCompile dependencyJunit
+    testCompile junitCompile
+    testRuntime junitRuntime
 }
diff --git a/props-core-scalacheck/build.gradle b/props-core-scalacheck/build.gradle
@@ -15,7 +15,8 @@ dependencies {
     compile "org.scala-lang:scala-library:$scalaVersion"
     compile "org.scalacheck:scalacheck_$scalacheckScalaVersion:$scalacheckVersion"
 
-    testCompile dependencyJunit
+    testCompile junitCompile
+    testRuntime junitRuntime
 }
 
 performSigning(signingEnabled, signModule)
diff --git a/props-core/build.gradle b/props-core/build.gradle
@@ -2,6 +2,7 @@
 archivesBaseName = "${project.projectName}-${project.name}"
 
 dependencies {
-	compile project(":quickcheck")
-    testCompile dependencyJunit
+    compile project(":quickcheck")
+    testCompile junitCompile
+    testRuntime junitRuntime
 }
diff --git a/quickcheck/build.gradle b/quickcheck/build.gradle
@@ -7,7 +7,7 @@ archivesBaseName = "${project.projectName}-${project.name}"
 
 dependencies {
 	compile project(":core")
-    compile dependencyJunit
+    compile junitCompile
 }
 
 performSigning(signingEnabled, signModule)

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ buildscript {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`wrapper {`
`23`		`- gradleVersion = "4.10.3"`
	`23`	`+ gradleVersion = "5.2.1"`
`24`	`24`	`distributionType = Wrapper.DistributionType.ALL`
`25`	`25`	`}`
`26`	`26`	`}`
`@@ -69,7 +69,8 @@ allprojects {`
`69`	`69`	`sonatypeUploadUrl = isSnapshot ? sonatypeSnapshotUrl : sonatypeReleaseUrl`
`70`	`70`	`primaryEmail = "functionaljava@googlegroups.com"`
`71`	`71`
`72`		`- dependencyJunit = "org.junit.vintage:junit-vintage-engine:5.3.2"`
	`72`	`+ junitCompile = "junit:junit:4.12"`
	`73`	`+ junitRuntime = "org.junit.vintage:junit-vintage-engine:5.3.2"`
`73`	`74`
`74`	`75`	`displayCompilerWarnings = true`
`75`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ archivesBaseName = "${project.projectName}-${project.name}"`
`4`	`4`	`dependencies {`
`5`	`5`	`compile("$group:$projectName:$fjConsumeVersion")`
`6`	`6`
`7`		`- testCompile dependencyJunit`
	`7`	`+ testCompile junitCompile`
	`8`	`+ testRuntime junitRuntime`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@ ext {`
`6`	`6`	`archivesBaseName = project.projectName`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- testCompile dependencyJunit`
	`9`	`+ testCompile junitCompile`
	`10`	`+ testRuntime junitRuntime`
`10`	`11`	`testCompile 'com.h2database:h2:1.4.197'`
`11`	`12`	`testCompile 'commons-dbutils:commons-dbutils:1.7'`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ archivesBaseName = "${project.projectName}-${project.name}"`
`8`	`8`	`dependencies {`
`9`	`9`	`compile project(":core")`
`10`	`10`	`compile project(":quickcheck")`
`11`		`- testCompile dependencyJunit`
	`11`	`+ testCompile junitCompile`
	`12`	`+ testRuntime junitRuntime`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@ ext {`
`7`	`7`
`8`	`8`	`dependencies {`
`9`	`9`	`compile project(":core")`
`10`		`- testCompile dependencyJunit`
	`10`	`+ testCompile junitCompile`
	`11`	`+ testRuntime junitRuntime`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`performSigning(signingEnabled, signModule)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`
`2`	`2`	`dependencies {`
`3`	`3`	`compile project(":core")`
`4`		`- testCompile dependencyJunit`
	`4`	`+ testCompile junitCompile`
	`5`	`+ testRuntime junitRuntime`
`5`	`6`	`}`