Skip to content

Commit 9711e2f

Browse files
loveleifloveleif
authored
Upgrade to Gradle 6.9.4 and Scala 2.12.20
1 parent 5fa002e commit 9711e2f

File tree

22 files changed

+133
-91
lines changed

22 files changed

+133
-91
lines changed

‎build.gradle‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
plugins {
2+
id 'java-library'
23
id 'com.github.hierynomus.license' version '0.15.0' apply false
34
id 'com.github.johnrengelman.shadow' version '4.0.3' apply false
4-
id 'com.github.alisiikh.scalastyle_2.12' version '2.1.0' apply false
5+
id 'com.github.alisiikh.scalastyle' version '3.5.0' apply false
56
id 'me.champeau.gradle.jmh' version '0.4.8' apply false
67
id "ch.kk7.spawn" version "1.0.20180924200750" apply false
78
}
@@ -18,26 +19,29 @@ apply from: 'build.licenses.gradle'
1819

1920
subprojects {
2021
apply plugin: 'scala'
22+
apply plugin: 'java-library'
2123

2224
repositories {
2325
mavenCentral()
2426
mavenLocal()
2527
}
2628

2729
dependencies {
28-
compile group: 'org.scala-lang', name: 'scala-library', version: ver.scala.full
30+
implementation group: 'org.scala-lang', name: 'scala-library', version: ver.scala.full
2931

3032
// Seems we need to lock these down, otherwise we get runtime errors on reflection
31-
compile group: 'org.scala-lang', name: 'scala-reflect', version: ver.scala.full
32-
compile group: 'org.scala-lang', name: 'scala-compiler', version: ver.scala.full
33-
34-
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: ver.log4j.main
35-
compile group: 'org.apache.logging.log4j', name: "log4j-api-scala".scala(), version: ver.log4j.scala
36-
37-
testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
38-
testCompile group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
39-
testCompile group: 'org.scalacheck', name: "scalacheck".scala(), version: ver.scalacheck
40-
testCompile group: 'org.junit.platform', name: 'junit-platform-runner', version: ver.junit.runner
33+
implementation group: 'org.scala-lang', name: 'scala-reflect', version: ver.scala.full
34+
implementation group: 'org.scala-lang', name: 'scala-compiler', version: ver.scala.full
35+
36+
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: ver.log4j.main
37+
implementation group: 'org.apache.logging.log4j', name: "log4j-api-scala".scala(), version: ver.log4j.scala
38+
39+
testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
40+
testImplementation group: 'org.scalatest', name: "scalatest".scala(), version: ver.scalatest
41+
testImplementation group: 'org.scalacheck', name: "scalacheck".scala(), version: ver.scalacheck
42+
testImplementation group: 'junit', name: 'junit', version: ver.junit.main
43+
testImplementation group: 'org.mockito', name: 'mockito-all', version: ver.mockito
44+
testRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-runner', version: ver.junit.runner
4145
}
4246

4347
test {

‎build.params.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ext {
1010
jvm : '1.8',
1111

1212
scala : [major: '2.12',
13-
full : '2.12.8'],
13+
full : '2.12.20'],
1414

1515
cypher : [frontend: '9.0.20190305',
1616
tck : '1.0.0-M14'],
@@ -39,6 +39,7 @@ ext {
3939

4040
junit : [main : '4.12',
4141
runner: '1.0.2'],
42+
apache: [commons: [text: '1.14.0']]
4243
]
4344

4445
}

‎build.style.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
subprojects {
2-
apply plugin: 'com.github.alisiikh.scalastyle'.scala()
2+
apply plugin: 'com.github.alisiikh.scalastyle'
33

4-
scalaStyle {
4+
scalastyle {
5+
scalaVersion = ver.scala.major
56
config = rootProject.file("etc/scalastyle_config.xml")
67
}
78
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Dec 07 11:38:19 CET 2018
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip

‎graph-ddl/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
description = 'Graph DDL'
22

33
dependencies {
4-
compile project(':okapi-trees')
5-
compile project(':okapi-api')
4+
api project(':okapi-trees')
5+
api project(':okapi-api')
66

7-
compile group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
7+
implementation group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
8+
implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
89

9-
testCompile project(':okapi-testing')
10+
testImplementation project(':okapi-testing')
1011
}

‎morpheus-examples/build.gradle‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,22 @@
11
description = 'Collection of examples for Cypher for Apache Spark'
22

33
dependencies {
4-
compile project(':morpheus-spark-cypher')
5-
compile project(':morpheus-testing')
4+
api project(':morpheus-spark-cypher')
5+
api project(':morpheus-testing')
66

7-
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
8-
compile group: 'org.apache.spark', name: "spark-graphx".scala(), version: ver.spark
9-
compile group: 'io.netty', name: 'netty-all', version: ver.netty
10-
compile group: 'com.h2database', name: 'h2', version: ver.h2
7+
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
8+
implementation group: 'org.apache.spark', name: "spark-graphx".scala(), version: ver.spark
9+
implementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
10+
implementation(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
11+
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
12+
}
13+
implementation group: 'io.netty', name: 'netty-all', version: ver.netty
14+
implementation group: 'com.h2database', name: 'h2', version: ver.h2
15+
implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
16+
exclude group: 'com.lihaoyi', module: 'utest'.scala()
17+
exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
18+
}
19+
implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
1120
}
1221

1322
tasks.test.dependsOn(":okapi-neo4j-io-testing:neo4jStart")

‎morpheus-jmh/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ apply plugin: 'me.champeau.gradle.jmh'
33
description = 'Micro benchmarks for Cypher for Apache Spark'
44

55
dependencies {
6-
compile project(':morpheus-spark-cypher')
6+
api project(':morpheus-spark-cypher')
77

8-
compile(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {
8+
implementation(group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark) {
99
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
1010
}
11-
compile(group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark) {
11+
implementation(group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark) {
1212
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
1313
}
14-
compile(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
14+
implementation(group: 'org.apache.spark', name: "spark-catalyst".scala(), version: ver.spark) {
1515
exclude group: 'org.slf4j', module: 'slf4j-log4j12'
1616
}
1717
}

‎morpheus-spark-cypher/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ if (project.hasProperty('testOkapiShade')) {
1313
}
1414
}
1515
dependencies {
16-
compile group: 'org.opencypher', name: 'okapi-shade', version: ver.self
16+
implementation group: 'org.opencypher', name: 'okapi-shade', version: ver.self
1717
}
1818
}
1919

2020
dependencies {
21-
compile project(':okapi-relational')
22-
compile project(':okapi-neo4j-io')
23-
compile project(':graph-ddl')
21+
api project(':okapi-relational')
22+
api project(':okapi-neo4j-io')
23+
api project(':graph-ddl')
2424

25-
compile(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
25+
implementation(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
2626
exclude group: 'com.lihaoyi', module: 'utest'.scala()
2727
exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
2828
}
29-
compile group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
30-
compile group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
29+
implementation group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
30+
implementation group: 'org.neo4j.driver', name: 'neo4j-java-driver', version: ver.neo4j.driver
3131

3232
compileOnly group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
3333
compileOnly group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,10 @@ object SqlGraphSources {
136136
SqlPropertyGraphDataSource(graphDdl, sqlDataSourceConfigs, idGenerationStrategy)
137137
}
138138

139-
def apply(graphDdlPath: String)(implicit morpheus: MorpheusSession): SqlGraphSourceFactory =
140-
SqlGraphSources(GraphDdl(using(Source.fromFile(graphDdlPath, "UTF-8"))(_.mkString)))
139+
def apply(graphDdlPath: String)(implicit morpheus: MorpheusSession): SqlGraphSourceFactory = {
140+
val content = using(Source.fromFile(graphDdlPath, "UTF-8"))(_.mkString)
141+
SqlGraphSources(GraphDdl(content))
142+
}
141143

142144
def apply(graphDdl: GraphDdl)(implicit morpheus: MorpheusSession): SqlGraphSourceFactory =
143145
SqlGraphSourceFactory(graphDdl = graphDdl, idGenerationStrategy = SerializedId)

‎morpheus-tck/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ sourceSets{
66
}
77

88
dependencies {
9-
testCompile project(':okapi-tck')
10-
testCompile project(':morpheus-testing')
11-
generatorCompile project(':okapi-tck')
12-
generatorCompile project(':morpheus-testing')
9+
testImplementation project(':okapi-tck')
10+
testImplementation project(':morpheus-testing')
11+
testImplementation group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
12+
generatorImplementation project(':okapi-tck')
13+
generatorImplementation project(':morpheus-testing')
1314
}
1415

1516
// split scenario name / key-words with | --> debugTCKScenarios -Pscenarios = 'sc1|sc2|..'

0 commit comments

Comments
 (0)