SAMZA-1016: Fix support for joint compilation of scala and java sources
Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/7ae261af Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/7ae261af Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/7ae261af Branch: refs/heads/master Commit: 7ae261afa55592934f2c30c69671ed8d7f9e7ce9 Parents: 19ef7cd Author: vjagadish1989 <jvenk...@linkedin.com> Authored: Fri Sep 30 11:47:53 2016 -0700 Committer: vjagadish1989 <jvenk...@linkedin.com> Committed: Fri Sep 30 11:47:53 2016 -0700 ---------------------------------------------------------------------- build.gradle | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/7ae261af/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index c80415d..ab257d3 100644 --- a/build.gradle +++ b/build.gradle @@ -138,7 +138,10 @@ project(":samza-core_$scalaVersion") { sourceSets.main.scala.srcDir "src/main/java" sourceSets.test.scala.srcDir "src/test/java" + // Disable the Javac compiler by forcing joint compilation by scalac. This is equivalent to setting + // tasks.compileTestJava.enabled = false sourceSets.main.java.srcDirs = [] + sourceSets.test.java.srcDirs = [] jar { manifest { @@ -169,6 +172,14 @@ project(":samza-autoscaling_$scalaVersion") { apply plugin: 'scala' apply plugin: 'checkstyle' + // Force scala joint compilation + sourceSets.main.scala.srcDir "src/main/java" + sourceSets.test.scala.srcDir "src/test/java" + + // Disable the Javac compiler by forcing joint compilation by scalac. This is equivalent to setting + // tasks.compileTestJava.enabled = false + sourceSets.main.java.srcDirs = [] + sourceSets.test.java.srcDirs = [] dependencies { compile project(':samza-api') @@ -218,7 +229,13 @@ project(':samza-elasticsearch') { project(":samza-kafka_$scalaVersion") { apply plugin: 'scala' + // Force scala joint compilation + sourceSets.main.scala.srcDir "src/main/java" sourceSets.test.scala.srcDir "src/test/java" + + // Disable the Javac compiler by forcing joint compilation by scalac. This is equivalent to setting + // tasks.compileTestJava.enabled = false + sourceSets.main.java.srcDirs = [] sourceSets.test.java.srcDirs = [] configurations { @@ -284,7 +301,12 @@ project(":samza-yarn_$scalaVersion") { // Force scala joint compilation sourceSets.main.scala.srcDir "src/main/java" + sourceSets.test.scala.srcDir "src/test/java" + + // Disable the Javac compiler by forcing joint compilation by scalac. This is equivalent to setting + // tasks.compileTestJava.enabled = false sourceSets.main.java.srcDirs = [] + sourceSets.test.java.srcDirs = [] dependencies { compile project(':samza-api') @@ -408,6 +430,16 @@ project(":samza-kv_$scalaVersion") { apply plugin: 'scala' apply plugin: 'checkstyle' + // Force scala joint compilation + sourceSets.main.scala.srcDir "src/main/java" + sourceSets.test.scala.srcDir "src/test/java" + + // Disable the Javac compiler by forcing joint compilation by scalac. This is equivalent to setting + // tasks.compileTestJava.enabled = false + sourceSets.main.java.srcDirs = [] + sourceSets.test.java.srcDirs = [] + + dependencies { compile project(':samza-api') compile project(":samza-core_$scalaVersion") @@ -438,7 +470,13 @@ project(":samza-kv-inmemory_$scalaVersion") { project(":samza-kv-rocksdb_$scalaVersion") { apply plugin: 'scala' + // Force scala joint compilation + sourceSets.main.scala.srcDir "src/main/java" sourceSets.test.scala.srcDir "src/test/java" + + // Disable the Javac compiler by forcing joint compilation by scalac. This is equivalent to setting + // tasks.compileTestJava.enabled = false + sourceSets.main.java.srcDirs = [] sourceSets.test.java.srcDirs = [] dependencies { @@ -538,6 +576,15 @@ project(":samza-test_$scalaVersion") { apply plugin: 'scala' apply plugin: 'checkstyle' + // Force scala joint compilation + sourceSets.main.scala.srcDir "src/main/java" + sourceSets.test.scala.srcDir "src/test/java" + + // Disable the Javac compiler by forcing joint compilation by scalac. This is equivalent to setting + // tasks.compileTestJava.enabled = false + sourceSets.main.java.srcDirs = [] + sourceSets.test.java.srcDirs = [] + configurations { // Remove transitive dependencies from Zookeeper that we don't want. compile.exclude group: 'javax.jms', module: 'jms'
