[openwhisk] branch master updated: Fix scala usage in :tools:admin and :core:standalone. (#4861)

[chetanm]

This is an automated email from the ASF dual-hosted git repository.

chetanm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new b9003ee  Fix scala usage in :tools:admin and :core:standalone. (#4861)
b9003ee is described below

commit b9003ee830efdfeb65631fd4f4539445be5937a1
Author: Markus Thömmes <markusthoem...@me.com>
AuthorDate: Sat Mar 14 09:32:05 2020 +0100

    Fix scala usage in :tools:admin and :core:standalone. (#4861)
---
 core/standalone/build.gradle | 5 +----
 tools/admin/build.gradle     | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/standalone/build.gradle b/core/standalone/build.gradle
index aa6ee52..b2fc7c9 100644
--- a/core/standalone/build.gradle
+++ b/core/standalone/build.gradle
@@ -152,6 +152,7 @@ bootJar {
 install.dependsOn(bootJar)
 
 dependencies {
+    compile "org.scala-lang:scala-library:${gradle.scala.version}"
     compile project(':core:controller')
     compile project(':tools:admin')
     compile "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2"
@@ -164,10 +165,6 @@ dependencies {
     testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
 }
 
-tasks.withType(ScalaCompile) {
-    scalaCompileOptions.additionalParameters = gradle.scala.compileFlags
-}
-
 gradle.projectsEvaluated {
     tasks.withType(Test) {
         testLogging {
diff --git a/tools/admin/build.gradle b/tools/admin/build.gradle
index 0f66609..0ce02f8 100644
--- a/tools/admin/build.gradle
+++ b/tools/admin/build.gradle
@@ -42,10 +42,7 @@ bootJar {
 }
 
 dependencies {
+    compile "org.scala-lang:scala-library:${gradle.scala.version}"
     compile project(':common:scala')
     compile "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2"
 }
-
-tasks.withType(ScalaCompile) {
-    scalaCompileOptions.additionalParameters = gradle.scala.compileFlags
-}