Upgrade to Gradle 6.9.4 and Scala 2.12.20

build.gradle

@@ -1,7 +1,8 @@
 plugins {
+    id 'java-library'
     id 'com.github.hierynomus.license' version '0.15.0' apply false
     id 'com.github.johnrengelman.shadow' version '4.0.3' apply false
-    id 'com.github.alisiikh.scalastyle_2.12' version '2.1.0' apply false
+    id 'com.github.alisiikh.scalastyle' version '3.5.0' apply false
     id 'me.champeau.gradle.jmh' version '0.4.8' apply false
     id "ch.kk7.spawn" version "1.0.20180924200750" apply false
 }
@@ -18,26 +19,29 @@ apply from: 'build.licenses.gradle'
 
 subprojects {
     apply plugin: 'scala'
+    apply plugin: 'java-library'
 
     repositories {
         mavenCentral()
         mavenLocal()
     }
 
     dependencies {
-        compile group: 'org.scala-lang', name: 'scala-library', version: ver.scala.full
+        implementation group: 'org.scala-lang', name: 'scala-library', version: ver.scala.full
 
         // Seems we need to lock these down, otherwise we get runtime errors on reflection
-        compile group: 'org.scala-lang', name: 'scala-reflect', version: ver.scala.full
-        compile group: 'org.scala-lang', name: 'scala-compiler', version: ver.scala.full
-
-        compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: ver.log4j.main
-        compile group: 'org.apache.logging.log4j', name: "log4j-api-scala".scala(), version: ver.log4j.scala
-
-        testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
-        testCompile group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
-        testCompile group: 'org.scalacheck', name: "scalacheck".scala(), version: ver.scalacheck
-        testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: ver.junit.runner
+        implementation group: 'org.scala-lang', name: 'scala-reflect', version: ver.scala.full
+        implementation group: 'org.scala-lang', name: 'scala-compiler', version: ver.scala.full
+
+        implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: ver.log4j.main
+        implementation group: 'org.apache.logging.log4j', name: "log4j-api-scala".scala(), version: ver.log4j.scala
+
+        testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
+        testImplementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
+        testImplementation group: 'org.scalacheck', name: "scalacheck".scala(), version: ver.scalacheck
+        testImplementation group: 'junit', name: 'junit', version: ver.junit.main
+        testImplementation group: 'org.mockito', name: 'mockito-all', version: ver.mockito
+        testRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-runner', version: ver.junit.runner
     }
 
     test {

build.params.gradle

@@ -10,7 +10,7 @@ ext {
             jvm       : '1.8',
 
             scala     : [major: '2.12',
-                         full : '2.12.8'],
+                         full : '2.12.20'],
 
             cypher    : [frontend: '9.0.20190305',
                          tck     : '1.0.0-M14'],
@@ -39,6 +39,7 @@ ext {
 
             junit     : [main  : '4.12',
                          runner: '1.0.2'],
+            apache: [commons: [text: '1.14.0']]
     ]
 
 }

build.style.gradle

@@ -1,7 +1,8 @@
 subprojects {
-    apply plugin: 'com.github.alisiikh.scalastyle'.scala()
+    apply plugin: 'com.github.alisiikh.scalastyle'
 
-    scalaStyle {
+    scalastyle {
+        scalaVersion = ver.scala.major
         config = rootProject.file("etc/scalastyle_config.xml")
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Dec 07 11:38:19 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip

graph-ddl/build.gradle

@@ -1,10 +1,11 @@
 description = 'Graph DDL'
 
 dependencies {
-    compile project(':okapi-trees')
-    compile project(':okapi-api')
+    api project(':okapi-trees')
+    api project(':okapi-api')
 
-    compile group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
+    implementation group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
 
-    testCompile project(':okapi-testing')
+    testImplementation project(':okapi-testing')
 }

morpheus-examples/build.gradle

@@ -1,13 +1,22 @@
 description = 'Collection of examples for Cypher for Apache Spark'
 
 dependencies {
-    compile project(':morpheus-spark-cypher')
-    compile project(':morpheus-testing')
+    api project(':morpheus-spark-cypher')
+    api project(':morpheus-testing')
 
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core',           version: ver.log4j.main
-    compile group: 'org.apache.spark',         name: "spark-graphx".scala(), version: ver.spark
-    compile group: 'io.netty',                 name: 'netty-all',            version: ver.netty
-    compile group: 'com.h2database',           name: 'h2',                   version: ver.h2
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core',           version: ver.log4j.main
+    implementation group: 'org.apache.spark',         name: "spark-graphx".scala(), version: ver.spark
+    implementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
+    implementation(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
+        exclude group: 'org.slf4j', module: 'slf4j-log4j12'
+    }
+    implementation group: 'io.netty',                 name: 'netty-all',            version: ver.netty
+    implementation group: 'com.h2database',           name: 'h2',                   version: ver.h2
+    implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
+        exclude group: 'com.lihaoyi', module: 'utest'.scala()
+        exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
+    }
+    implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
 }
 
 tasks.test.dependsOn(":okapi-neo4j-io-testing:neo4jStart")

morpheus-jmh/build.gradle

@@ -3,15 +3,15 @@ apply plugin: 'me.champeau.gradle.jmh'
 description = 'Micro benchmarks for Cypher for Apache Spark'
 
 dependencies {
-    compile project(':morpheus-spark-cypher')
+    api project(':morpheus-spark-cypher')
 
-    compile(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {
+    implementation(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
-    compile(group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark) {
+    implementation(group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark) {
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
-    compile(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
+    implementation(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
         exclude group: 'org.slf4j', module: 'slf4j-log4j12'
     }
 }

morpheus-spark-cypher/build.gradle

@@ -13,21 +13,21 @@ if (project.hasProperty('testOkapiShade')) {
         }
     }
     dependencies {
-        compile group: 'org.opencypher', name: 'okapi-shade', version: ver.self
+        implementation group: 'org.opencypher', name: 'okapi-shade', version: ver.self
     }
 }
 
 dependencies {
-    compile project(':okapi-relational')
-    compile project(':okapi-neo4j-io')
-    compile project(':graph-ddl')
+    api project(':okapi-relational')
+    api project(':okapi-neo4j-io')
+    api project(':graph-ddl')
 
-    compile(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
+    implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
         exclude group: 'com.lihaoyi', module: 'utest'.scala()
         exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
     }
-    compile group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
-    compile group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
+    implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
 
     compileOnly group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
     compileOnly group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark

morpheus-spark-cypher/src/main/scala/org/opencypher/morpheus/api/GraphSources.scala

@@ -136,8 +136,10 @@ object SqlGraphSources {
       SqlPropertyGraphDataSource(graphDdl, sqlDataSourceConfigs, idGenerationStrategy)
   }
 
-  def apply(graphDdlPath: String)(implicit morpheus: MorpheusSession): SqlGraphSourceFactory =
-    SqlGraphSources(GraphDdl(using(Source.fromFile(graphDdlPath, "UTF-8"))(_.mkString)))
+  def apply(graphDdlPath: String)(implicit morpheus: MorpheusSession): SqlGraphSourceFactory = {
+    val content = using(Source.fromFile(graphDdlPath, "UTF-8"))(_.mkString)
+    SqlGraphSources(GraphDdl(content))
+  }
 
   def apply(graphDdl: GraphDdl)(implicit morpheus: MorpheusSession): SqlGraphSourceFactory =
     SqlGraphSourceFactory(graphDdl = graphDdl, idGenerationStrategy = SerializedId)

morpheus-tck/build.gradle

@@ -6,10 +6,11 @@ sourceSets{
 }
 
 dependencies {
-    testCompile project(':okapi-tck')
-    testCompile project(':morpheus-testing')
-    generatorCompile project(':okapi-tck')
-    generatorCompile project(':morpheus-testing')
+    testImplementation project(':okapi-tck')
+    testImplementation project(':morpheus-testing')
+    testImplementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
+    generatorImplementation project(':okapi-tck')
+    generatorImplementation project(':morpheus-testing')
 }
 
 // split scenario name / key-words with | --> debugTCKScenarios -Pscenarios = 'sc1|sc2|..'

morpheus-testing/build.gradle

@@ -3,19 +3,26 @@ apply plugin: 'ch.kk7.spawn'
 description = 'Cypher for Apache Spark - Test Utilities'
 
 dependencies {
-    compile project(':morpheus-spark-cypher')
-    compile project(':okapi-testing')
-    compile project(':okapi-neo4j-io-testing')
+    api project(':morpheus-spark-cypher')
+    api project(':okapi-testing')
+    api project(':okapi-neo4j-io-testing')
 
-    compile group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
-    compile group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
-    compile group: 'org.apache.spark', name: "spark-hive".scala(), version: ver.spark
-    compile group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: ver.hadoop
+    implementation group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
+    implementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
+    implementation group: 'org.apache.spark', name: "spark-hive".scala(), version: ver.spark
+    implementation group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: ver.hadoop
 
-    testCompile project(':okapi-api').sourceSets.test.output
-    testCompile group: 'com.h2database', name: 'h2', version: ver.h2
-    testCompile group: 'org.spire-math', name: 'claimant'.scala(), version: ver.claimant
+    implementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
+    implementation group: 'org.mockito', name: 'mockito-all', version: ver.mockito
 
+    testImplementation project(':okapi-api').sourceSets.test.output
+    testImplementation group: 'com.h2database', name: 'h2', version: ver.h2
+    testImplementation group: 'org.spire-math', name: 'claimant'.scala(), version: ver.claimant
+    testImplementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
+        exclude group: 'com.lihaoyi', module: 'utest'.scala()
+        exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
+    }
+    testImplementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
 }
 
 tasks.test.dependsOn(":okapi-neo4j-io-testing:neo4jStart")

okapi-api/build.gradle

@@ -1,21 +1,20 @@
 description = 'Okapi - openCypher API'
 
 dependencies {
-    compile project(':okapi-trees')
+    api project(':okapi-trees')
 
-    compile(group: 'org.opencypher', name: 'front-end-9.0', version: ver.cypher.frontend) {
+    implementation(group: 'org.opencypher', name: 'front-end-9.0', version: ver.cypher.frontend) {
         exclude group: 'org.scalacheck', module: 'scalacheck'.scala()
     }
 
-    compile group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
-    compile(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
+    implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
         exclude group: 'com.lihaoyi', module: 'utest'.scala()
         exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
     }
-    compile group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
+    implementation group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
 
-    testCompile group: "org.typelevel", name: "discipline".scala(), version: ver.discipline
-    testCompile group: "org.typelevel", name: "cats-laws".scala(), version: ver.cats
-    testCompile group: 'org.mockito', name: 'mockito-all', version: ver.mockito
-    testCompile group: 'junit', name: 'junit', version: ver.junit.main
+    testImplementation group: "org.typelevel", name: "discipline".scala(), version: ver.discipline
+    testImplementation group: "org.typelevel", name: "cats-laws".scala(), version: ver.cats
+    testImplementation group: 'junit', name: 'junit', version: ver.junit.main
 }

okapi-ir/build.gradle

@@ -1,12 +1,16 @@
 description = 'Okapi IR - Declarative representation of Cypher queries'
 
 dependencies {
-    compile project(':okapi-api')
+    api project(':okapi-api')
 
-    compile group: 'org.atnos', name: "eff".scala(), version: ver.eff
+    implementation group: 'org.opencypher', name: 'expressions-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.opencypher', name: 'ast-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.opencypher', name: 'rewriting-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.atnos', name: "eff".scala(), version: ver.eff
 
-    testCompile project(':okapi-testing')
+    testImplementation project(':okapi-testing')
 
-    testCompile group: 'org.opencypher', name: 'ast-9.0',  version: ver.cypher.frontend, classifier: 'tests'
-    testCompile group: 'org.opencypher', name: 'util-9.0', version: ver.cypher.frontend, classifier: 'tests'
+    testImplementation group: 'org.opencypher', name: 'util-9.0', version: ver.cypher.frontend, classifier: 'tests'
+    testImplementation group: 'org.opencypher', name: 'ast-9.0',  version: ver.cypher.frontend, classifier: 'tests'
 }

okapi-logical/build.gradle

@@ -1,7 +1,10 @@
 description = 'Okapi Logical - Logical representation of Cypher queries'
 
 dependencies {
-    compile project(':okapi-ir')
+    api project(':okapi-ir')
 
-    testCompile project(':okapi-testing')
+    implementation group: 'org.opencypher', name: 'expressions-9.0',  version: ver.cypher.frontend
+
+    testImplementation project(':okapi-testing')
+    testImplementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
 }

okapi-neo4j-io-testing/build.gradle

@@ -10,13 +10,15 @@ sourceSets {
 }
 
 dependencies {
-    compile project(':okapi-neo4j-io')
-    compile project(':okapi-testing')
+    api project(':okapi-neo4j-io')
+    api project(':okapi-testing')
 
-    compile group: 'org.bouncycastle', name: 'bctls-jdk15on', version: ver.bctls
+    implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
+    implementation group: 'org.bouncycastle', name: 'bctls-jdk15on', version: ver.bctls
+    implementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
 
-    servicesCompile group: 'org.neo4j.test', name: 'neo4j-harness',            version: ver.neo4j.harness
-    servicesCompile group: 'org.neo4j.test', name: 'neo4j-harness-enterprise', version: ver.neo4j.harness
+    servicesImplementation group: 'org.neo4j.test', name: 'neo4j-harness',            version: ver.neo4j.harness
+    servicesImplementation group: 'org.neo4j.test', name: 'neo4j-harness-enterprise', version: ver.neo4j.harness
 }
 
 def neo4jLauncher(String launcher, int instances, String starter, String stopper, String status) {

okapi-neo4j-io/build.gradle

@@ -1,7 +1,7 @@
 description = 'Okapi - Neo4j IO'
 
 dependencies {
-    compile project(':okapi-api')
+    api project(':okapi-api')
 
-    compile group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
+    implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
 }

okapi-relational/build.gradle

@@ -3,9 +3,12 @@ apply plugin: 'com.github.johnrengelman.shadow'
 description = 'Okapi Relational - Relational Algebra for Cypher'
 
 dependencies {
-    compile project(':okapi-logical')
+    api project(':okapi-logical')
 
-    testCompile project(':okapi-testing')
+    implementation group: 'org.opencypher', name: 'front-end-9.0',  version: ver.cypher.frontend
+    implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
+
+    testImplementation project(':okapi-testing')
 }
 
 shadowJar {

okapi-shade/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 description = 'Okapi Shade contains the full Okapi stack and its relocated dependencies'
 
 dependencies {
-    compile project(':okapi-relational')
+    api project(':okapi-relational')
 }
 
 ext.excludedDependencyGroups = [

okapi-tck/build.gradle

@@ -1,9 +1,11 @@
 description = 'Okapi TCK - TCK integration for the Okapi pipeline'
 
 dependencies {
-    compile project(':okapi-testing')
-    compile project(':okapi-ir')
+    api project(':okapi-testing')
+    api project(':okapi-ir')
 
-    compile group: 'org.opencypher', name: 'tck',             version: ver.cypher.tck
-    compile group: 'org.opencypher', name: 'tck-api'.scala(), version: ver.cypher.tck
+    api group: 'org.opencypher', name: 'tck',             version: ver.cypher.tck
+    api group: 'org.opencypher', name: 'tck-api'.scala(), version: ver.cypher.tck
+    implementation group: 'org.apache.commons', name: 'commons-text', version: ver.apache.commons.text
+    implementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
 }

okapi-tck/src/main/scala/org/opencypher/okapi/tck/test/CreateStringGenerator.scala

@@ -27,7 +27,7 @@
 package org.opencypher.okapi.tck.test
 
 
-import org.apache.commons.lang3.StringEscapeUtils
+import org.apache.commons.text.StringEscapeUtils
 import org.opencypher.okapi.impl.exception.NotImplementedException
 import org.opencypher.okapi.tck.test.TckToCypherConverter.tckValueToCypherValue
 import org.opencypher.okapi.api.value.CypherValue.{CypherList => OKAPICypherList, CypherMap => OKAPICypherMap, CypherNull => OKAPICypherNull, CypherString => OKAPICypherString, CypherValue => OKAPICypherValue}