Skip to content

Commit 57a344c

Browse files
loveleifloveleif
committed
Fix deprecated gradle configurations
1 parent 38e36d0 commit 57a344c

File tree

17 files changed

+82
-80
lines changed

17 files changed

+82
-80
lines changed

‎build.gradle‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
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
45
id 'com.github.alisiikh.scalastyle' version '3.5.0' apply false
@@ -18,26 +19,27 @@ 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+
api 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+
api group: 'org.scala-lang', name: 'scala-reflect', version: ver.scala.full
34+
api group: 'org.scala-lang', name: 'scala-compiler', version: ver.scala.full
3335

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+
api group: 'org.apache.logging.log4j', name: 'log4j-api', version: ver.log4j.main
37+
api group: 'org.apache.logging.log4j', name: "log4j-api-scala".scala(), version: ver.log4j.scala
3638

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
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+
testRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-runner', version: ver.junit.runner
4143
}
4244

4345
test {

‎graph-ddl/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
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+
api group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
88

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

‎morpheus-examples/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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+
api group: 'org.apache.logging.log4j', name: 'log4j-core', version: ver.log4j.main
8+
api group: 'org.apache.spark', name: "spark-graphx".scala(), version: ver.spark
9+
api group: 'io.netty', name: 'netty-all', version: ver.netty
10+
api group: 'com.h2database', name: 'h2', version: ver.h2
1111
}
1212

1313
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+
api(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+
api(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+
api(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+
api 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+
api(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+
api group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
30+
api 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-tck/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ 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+
generatorImplementation project(':okapi-tck')
12+
generatorImplementation project(':morpheus-testing')
1313
}
1414

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

‎morpheus-testing/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ apply plugin: 'ch.kk7.spawn'
33
description = 'Cypher for Apache Spark - Test Utilities'
44

55
dependencies {
6-
compile project(':morpheus-spark-cypher')
7-
compile project(':okapi-testing')
8-
compile project(':okapi-neo4j-io-testing')
6+
api project(':morpheus-spark-cypher')
7+
api project(':okapi-testing')
8+
api project(':okapi-neo4j-io-testing')
99

10-
compile group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
11-
compile group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
12-
compile group: 'org.apache.spark', name: "spark-hive".scala(), version: ver.spark
13-
compile group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: ver.hadoop
10+
api group: 'org.apache.spark', name: "spark-core".scala(), version: ver.spark
11+
api group: 'org.apache.spark', name: "spark-sql".scala(), version: ver.spark
12+
api group: 'org.apache.spark', name: "spark-hive".scala(), version: ver.spark
13+
api group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: ver.hadoop
1414

15-
testCompile project(':okapi-api').sourceSets.test.output
16-
testCompile group: 'com.h2database', name: 'h2', version: ver.h2
17-
testCompile group: 'org.spire-math', name: 'claimant'.scala(), version: ver.claimant
15+
testImplementation project(':okapi-api').sourceSets.test.output
16+
testImplementation group: 'com.h2database', name: 'h2', version: ver.h2
17+
testImplementation group: 'org.spire-math', name: 'claimant'.scala(), version: ver.claimant
1818

1919
}
2020

‎okapi-api/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
description = 'Okapi - openCypher API'
22

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

6-
compile(group: 'org.opencypher', name: 'front-end-9.0', version: ver.cypher.frontend) {
6+
api(group: 'org.opencypher', name: 'front-end-9.0', version: ver.cypher.frontend) {
77
exclude group: 'org.scalacheck', module: 'scalacheck'.scala()
88
}
99

10-
compile group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
11-
compile(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
10+
api group: 'org.typelevel', name: "cats-core".scala(), version: ver.cats
11+
api(group: 'com.lihaoyi', name: "upickle".scala(), version: ver.upickle) {
1212
exclude group: 'com.lihaoyi', module: 'utest'.scala()
1313
exclude group: 'com.lihaoyi', module: 'acyclic'.scala()
1414
}
15-
compile group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
15+
api group: 'com.lihaoyi', name: "fastparse".scala(), version: ver.fastparse
1616

17-
testCompile group: "org.typelevel", name: "discipline".scala(), version: ver.discipline
18-
testCompile group: "org.typelevel", name: "cats-laws".scala(), version: ver.cats
19-
testCompile group: 'org.mockito', name: 'mockito-all', version: ver.mockito
20-
testCompile group: 'junit', name: 'junit', version: ver.junit.main
17+
testImplementation group: "org.typelevel", name: "discipline".scala(), version: ver.discipline
18+
testImplementation group: "org.typelevel", name: "cats-laws".scala(), version: ver.cats
19+
testImplementation group: 'org.mockito', name: 'mockito-all', version: ver.mockito
20+
testImplementation group: 'junit', name: 'junit', version: ver.junit.main
2121
}

‎okapi-ir/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
description = 'Okapi IR - Declarative representation of Cypher queries'
22

33
dependencies {
4-
compile project(':okapi-api')
4+
api project(':okapi-api')
55

6-
compile group: 'org.atnos', name: "eff".scala(), version: ver.eff
6+
api group: 'org.atnos', name: "eff".scala(), version: ver.eff
77

8-
testCompile project(':okapi-testing')
8+
testImplementation project(':okapi-testing')
99

10-
testCompile group: 'org.opencypher', name: 'ast-9.0', version: ver.cypher.frontend, classifier: 'tests'
11-
testCompile group: 'org.opencypher', name: 'util-9.0', version: ver.cypher.frontend, classifier: 'tests'
10+
testImplementation group: 'org.opencypher', name: 'ast-9.0', version: ver.cypher.frontend, classifier: 'tests'
11+
testImplementation group: 'org.opencypher', name: 'util-9.0', version: ver.cypher.frontend, classifier: 'tests'
1212
}

‎okapi-logical/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
description = 'Okapi Logical - Logical representation of Cypher queries'
22

33
dependencies {
4-
compile project(':okapi-ir')
4+
api project(':okapi-ir')
55

6-
testCompile project(':okapi-testing')
6+
testImplementation project(':okapi-testing')
77
}

0 commit comments

Comments
 (0)