0005140: Upgrade to gradle version 6.9.1

Replace runtime, testCompile with non-deprecated dependency
configurations.

symmetric-android/build.gradle

@@ -27,7 +27,7 @@ apply from: symAssembleDir + '/common.gradle'
                 from { 'CREDITS' }
                 from { 'NOTICE' }
                 into('libs') {
-                    from configurations.runtime - configurations.provided
+                    from configurations.runtimeClasspath - configurations.provided
                     from jar
                 }
             }

symmetric-assemble/common.gradle

@@ -90,7 +90,9 @@ subprojects { subproject ->
     apply plugin: 'jacoco'
 
     configurations { deployerJars }
-    configurations { testArtifacts.extendsFrom testRuntime }
+    configurations {
+    	testArtifacts.extendsFrom testRuntimeClasspath
+    }
 
     configurations {
     	provided {
@@ -362,14 +364,14 @@ subprojects { subproject ->
         compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
         compileOnly "com.github.spotbugs:spotbugs-annotations:$spotBugsVersion"
 
-        testCompile fileTree(dir: System.getProperty("user.home") + '/.symmetricds/lib', include: '*.jar')
-        testCompile "org.junit.jupiter:junit-jupiter-api:$junitVersion"
+        testImplementation fileTree(dir: System.getProperty("user.home") + '/.symmetricds/lib', include: '*.jar')
+        testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
         testImplementation "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
 
-        testCompile "org.hamcrest:hamcrest-all:$hamcrestVersion"
-        testCompile "org.mockito:mockito-core:$mockitoVersion"
-        testCompile "org.powermock:powermock-api-mockito2:$powerMockVersion"
-        testCompile "org.powermock:powermock-module-junit4:$powerMockVersion"
+        testImplementation "org.hamcrest:hamcrest-all:$hamcrestVersion"
+        testImplementation "org.mockito:mockito-core:$mockitoVersion"
+        testImplementation "org.powermock:powermock-api-mockito2:$powerMockVersion"
+        testImplementation "org.powermock:powermock-module-junit4:$powerMockVersion"
 
         deployerJars "org.apache.maven.wagon:wagon-ssh:3.5.1"        
     }    

symmetric-client/build.gradle

@@ -34,8 +34,8 @@ apply from: symAssembleDir + '/common.gradle'
 
         compileOnly "org.codehaus.mojo:animal-sniffer-annotations:$animalSnifferVersion"
 
-        testCompile project(path: ':symmetric-util', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-io', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-jdbc', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-core', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-io', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-jdbc', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-core', configuration: 'testArtifacts')
     }

symmetric-core/build.gradle

@@ -36,6 +36,6 @@ apply from: symAssembleDir + '/common.gradle'
             exclude group: 'org.slf4j'
         }
 
-        testCompile project(path: ':symmetric-util', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-jdbc', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-jdbc', configuration: 'testArtifacts')
     }

symmetric-csv/build.gradle

@@ -2,5 +2,5 @@ apply from: symAssembleDir + '/common.gradle'
 
     description = 'General purpose csv parser'
     dependencies {
-        testCompile project(path: ':symmetric-util', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
     }

symmetric-db/build.gradle

@@ -16,5 +16,5 @@ apply from: symAssembleDir + '/common.gradle'
             exclude group: 'io.netty'
         }
 
-        testCompile project(path: ':symmetric-util', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
     }

symmetric-io/build.gradle

@@ -22,6 +22,6 @@ apply from: symAssembleDir + '/common.gradle'
             exclude group: 'com.fasterxml.jackson.databind'
         }
 
-        testCompile project(path: ':symmetric-util', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-jdbc', configuration: 'testArtifacts')        
+        testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-jdbc', configuration: 'testArtifacts')        
     }

symmetric-jdbc/build.gradle

@@ -12,25 +12,25 @@ apply from: symAssembleDir + '/common.gradle'
         compileOnly "com.h2database:h2:$h2Version"
         compileOnly "jdbc.sybase:jconnect:7.7"
 
-        testCompile project(path: ':symmetric-util', configuration: 'testArtifacts')
-        testCompile "com.h2database:h2:$h2Version"
-        testCompile "mysql:mysql-connector-java:$mysqlVersion"
-        testCompile "org.postgresql:postgresql:$postgresqlVersion"
-        testCompile "com.oracle.database.jdbc:ojdbc8:21.5.0.0"
-        testCompile "net.sourceforge.jtds:jtds:$jtdsVersion"
-        testCompile "jdbc.sybase:jconnect:7.7"
-        testCompile "org.apache.derby:derby:$derbyVersion"
-        testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
-        testCompile "org.xerial:sqlite-jdbc:$sqliteVersion"
-        testCompile "jdbc.db2:db2jcc:9.7"
-        testCompile "org.firebirdsql.jdbc:jaybird:4.0.5.java8"
-        testCompile "javax.resource:connector-api:1.5"
-        testCompile "jdbc.informix:ifxjdbc:1.0"
-        testCompile "jdbc.informix:ifxlang:1.0"
-        testCompile "jdbc.interbase:interclient:13.2.0"
-        testCompile "org.mariadb.jdbc:mariadb-java-client:2.7.5"
-        testCompile "com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8"
-        testCompile "jdbc.nuodb:nuodb-jdbc:3.3.1"
-        testCompile "jdbc.tibero:tibero:6"
-        testCompile "org.voltdb:voltdbclient:8.4.1"
+        testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
+        testImplementation "com.h2database:h2:$h2Version"
+        testImplementation "mysql:mysql-connector-java:$mysqlVersion"
+        testImplementation "org.postgresql:postgresql:$postgresqlVersion"
+        testImplementation "com.oracle.database.jdbc:ojdbc8:21.5.0.0"
+        testImplementation "net.sourceforge.jtds:jtds:$jtdsVersion"
+        testImplementation "jdbc.sybase:jconnect:7.7"
+        testImplementation "org.apache.derby:derby:$derbyVersion"
+        testImplementation "org.hsqldb:hsqldb:$hsqldbVersion"
+        testImplementation "org.xerial:sqlite-jdbc:$sqliteVersion"
+        testImplementation "jdbc.db2:db2jcc:9.7"
+        testImplementation "org.firebirdsql.jdbc:jaybird:4.0.5.java8"
+        testImplementation "javax.resource:connector-api:1.5"
+        testImplementation "jdbc.informix:ifxjdbc:1.0"
+        testImplementation "jdbc.informix:ifxlang:1.0"
+        testImplementation "jdbc.interbase:interclient:13.2.0"
+        testImplementation "org.mariadb.jdbc:mariadb-java-client:2.7.5"
+        testImplementation "com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8"
+        testImplementation "jdbc.nuodb:nuodb-jdbc:3.3.1"
+        testImplementation "jdbc.tibero:tibero:6"
+        testImplementation "org.voltdb:voltdbclient:8.4.1"
     }

symmetric-server/build.gradle

@@ -50,11 +50,11 @@ apply from: symAssembleDir + '/asciidoc.gradle'
         provided "org.mortbay.jetty.alpn:alpn-boot:$alpnBootVersion"
         compileOnly "org.eclipse.jetty.alpn:alpn-api:$alpnApiVersion"
 
-        testCompile project(path: ':symmetric-util', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-io', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-jdbc', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-core', configuration: 'testArtifacts')
-        testCompile project(path: ':symmetric-client', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-util', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-io', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-jdbc', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-core', configuration: 'testArtifacts')
+        testImplementation project(path: ':symmetric-client', configuration: 'testArtifacts')
     }
 
     distributions {

symmetric-sqlexplorer/build.gradle

@@ -40,10 +40,10 @@ dependencies {
     compile "de.f0rce:ace:1.3.0"
     compile "com.vaadin:vaadin-context-menu:3.1.0"
 
-    testCompile "com.h2database:h2:$h2Version"
-    testCompile "javax.websocket:javax.websocket-api:$websocketVersion"    
-    testCompile "org.eclipse.jetty:jetty-webapp:$jettyVersion"
-    testCompile "org.eclipse.jetty.websocket:javax-websocket-server-impl:$jettyVersion"    
+    testImplementation "com.h2database:h2:$h2Version"
+    testImplementation "javax.websocket:javax.websocket-api:$websocketVersion"    
+    testImplementation "org.eclipse.jetty:jetty-webapp:$jettyVersion"
+    testImplementation "org.eclipse.jetty.websocket:javax-websocket-server-impl:$jettyVersion"    
 
 	implementation "com.vaadin:vaadin-core:14.+"
 }