Upgrade to Gradle 6.4.1

chris-allan · chris-allan · commit c3b32a456851 · 2020-06-01T23:29:20.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,7 @@ sourceSets {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.11'
+    testImplementation 'junit:junit:4.12'
 }
 
 task cmakeTask(type: Exec) {
@@ -85,11 +85,14 @@ task generateJNI(type: Exec) {
 
 import org.apache.tools.ant.taskdefs.condition.Os
 test {
+    useJUnit()
+
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         systemProperty "java.library.path", "$buildDir\\install\\bin;$buildDir\\tiledb_jni\\Release"
     } else {
         systemProperty "java.library.path", "$buildDir/install/lib:$buildDir/install/lib64:$buildDir/tiledb_jni"
     }
+
     testLogging {
         showStandardStreams = true
     }
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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -13,5 +13,4 @@ pluginManagement {
         }
     }
 }
-enableFeaturePreview('STABLE_PUBLISHING')
 rootProject.name = 'tiledb-java'

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ sourceSets {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`dependencies {`
`44`		`- testCompile group: 'junit', name: 'junit', version: '4.11'`
	`44`	`+ testImplementation 'junit:junit:4.12'`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`task cmakeTask(type: Exec) {`
`@@ -85,11 +85,14 @@ task generateJNI(type: Exec) {`
`85`	`85`
`86`	`86`	`import org.apache.tools.ant.taskdefs.condition.Os`
`87`	`87`	`test {`
	`88`	`+ useJUnit()`
	`89`	`+`
`88`	`90`	`if (Os.isFamily(Os.FAMILY_WINDOWS)) {`
`89`	`91`	`systemProperty "java.library.path", "$buildDir\\install\\bin;$buildDir\\tiledb_jni\\Release"`
`90`	`92`	`} else {`
`91`	`93`	`systemProperty "java.library.path", "$buildDir/install/lib:$buildDir/install/lib64:$buildDir/tiledb_jni"`
`92`	`94`	`}`
	`95`	`+`
`93`	`96`	`testLogging {`
`94`	`97`	`showStandardStreams = true`
`95`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,4 @@ pluginManagement {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`	`}`
`16`		`-enableFeaturePreview('STABLE_PUBLISHING')`
`17`	`16`	`rootProject.name = 'tiledb-java'`