Repository: samza Updated Branches: refs/heads/master 47881a24b -> 6af104ea3
SAMZA-1595: Fix scalacCompileOptions format to build with zinc scala compiler. Zinc scala compiler(part of gradle version >= 3.0) expects the scala compilation arguments as a list(where each compilation argument is an element of the list). In samza, the compilation arguments are concatenated into a single string and passed to the compiler. This causes build failures when samza is built with Zinc scala compiler. Existing ant scala compiler used to build samza in open source accepts the compilation arguments both as list and string. Author: Shanthoosh Venkataraman <svenkatara...@linkedin.com> Reviewers: Xinyu Liu <xinyuliu...@gmail.com> Closes #430 from shanthoosh/master Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/6af104ea Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/6af104ea Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/6af104ea Branch: refs/heads/master Commit: 6af104ea3e440f89197073b68ba0f1004e793d45 Parents: 47881a2 Author: Shanthoosh Venkataraman <svenkatara...@linkedin.com> Authored: Thu Feb 22 16:44:00 2018 -0800 Committer: xiliu <xi...@linkedin.com> Committed: Thu Feb 22 16:44:00 2018 -0800 ---------------------------------------------------------------------- build.gradle | 2 +- gradle/dependency-versions-scala-2.10.gradle | 2 +- gradle/dependency-versions-scala-2.11.gradle | 2 +- gradle/dependency-versions-scala-2.12.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/6af104ea/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 4aab830..a15a456 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,7 @@ allprojects { // For all scala compilation, add extra compiler options, taken from version-specific // dependency-versions-scala file applied above. tasks.withType(ScalaCompile) { - scalaCompileOptions.additionalParameters = [ scalaOptions ] + scalaCompileOptions.additionalParameters = scalaOptions } } http://git-wip-us.apache.org/repos/asf/samza/blob/6af104ea/gradle/dependency-versions-scala-2.10.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions-scala-2.10.gradle b/gradle/dependency-versions-scala-2.10.gradle index 698cfbc..f42775f 100644 --- a/gradle/dependency-versions-scala-2.10.gradle +++ b/gradle/dependency-versions-scala-2.10.gradle @@ -23,7 +23,7 @@ ext { // -feature: Give detailed warnings about language feature use (rather than just 'there were 4 warnings') // -language:implicitConversions: Allow the use of implicit conversions without warning or library import // -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import - scalaOptions = "-feature -language:implicitConversions -language:reflectiveCalls" + scalaOptions = ["-feature", "-language:implicitConversions", "-language:reflectiveCalls"] scalatraVersion = "2.2.1" jettyVersion = "9.2.7.v20150116" } http://git-wip-us.apache.org/repos/asf/samza/blob/6af104ea/gradle/dependency-versions-scala-2.11.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions-scala-2.11.gradle b/gradle/dependency-versions-scala-2.11.gradle index e033a86..2fbb22b 100644 --- a/gradle/dependency-versions-scala-2.11.gradle +++ b/gradle/dependency-versions-scala-2.11.gradle @@ -23,7 +23,7 @@ ext { // -feature: Give detailed warnings about language feature use (rather than just 'there were 4 warnings') // -language:implicitConversions: Allow the use of implicit conversions without warning or library import // -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import - scalaOptions = "-feature -language:implicitConversions -language:reflectiveCalls" + scalaOptions = ["-feature", "-language:implicitConversions", "-language:reflectiveCalls"] scalatraVersion = "2.5.0" jettyVersion = "9.2.7.v20150116" } http://git-wip-us.apache.org/repos/asf/samza/blob/6af104ea/gradle/dependency-versions-scala-2.12.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions-scala-2.12.gradle b/gradle/dependency-versions-scala-2.12.gradle index f3eec81..3c8e93d 100644 --- a/gradle/dependency-versions-scala-2.12.gradle +++ b/gradle/dependency-versions-scala-2.12.gradle @@ -23,7 +23,7 @@ ext { // -feature: Give detailed warnings about language feature use (rather than just 'there were 4 warnings') // -language:implicitConversions: Allow the use of implicit conversions without warning or library import // -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import - scalaOptions = "-feature -language:implicitConversions -language:reflectiveCalls" + scalaOptions = ["-feature", "-language:implicitConversions", "-language:reflectiveCalls"] scalatraVersion = "2.5.0" jettyVersion = "9.2.7.v20150116" }
