Skip to content

Commit b9003ee

Browse files
Fix scala usage in :tools:admin and :core:standalone. (#4861)
1 parent 3cc850f commit b9003ee

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

core/standalone/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ bootJar {
152152
install.dependsOn(bootJar)
153153

154154
dependencies {
155+
compile "org.scala-lang:scala-library:${gradle.scala.version}"
155156
compile project(':core:controller')
156157
compile project(':tools:admin')
157158
compile "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2"
@@ -164,10 +165,6 @@ dependencies {
164165
testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
165166
}
166167

167-
tasks.withType(ScalaCompile) {
168-
scalaCompileOptions.additionalParameters = gradle.scala.compileFlags
169-
}
170-
171168
gradle.projectsEvaluated {
172169
tasks.withType(Test) {
173170
testLogging {

tools/admin/build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ bootJar {
4242
}
4343

4444
dependencies {
45+
compile "org.scala-lang:scala-library:${gradle.scala.version}"
4546
compile project(':common:scala')
4647
compile "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2"
4748
}
48-
49-
tasks.withType(ScalaCompile) {
50-
scalaCompileOptions.additionalParameters = gradle.scala.compileFlags
51-
}

0 commit comments

Comments
 (0)