Repository: kafka Updated Branches: refs/heads/trunk fa03a7c6c -> 458ebeb04
kafka-2323; Simplify ScalaTest dependency versions; patched by Ismael Juma; reviewed by Jun Rao Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/458ebeb0 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/458ebeb0 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/458ebeb0 Branch: refs/heads/trunk Commit: 458ebeb04bffb3237a46c12e05e270d9b26d4d40 Parents: fa03a7c Author: Ismael Juma <[email protected]> Authored: Thu Jul 16 16:21:50 2015 -0700 Committer: Jun Rao <[email protected]> Committed: Thu Jul 16 16:21:50 2015 -0700 ---------------------------------------------------------------------- build.gradle | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/458ebeb0/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index d86f1a8..9059bc4 100644 --- a/build.gradle +++ b/build.gradle @@ -225,8 +225,6 @@ project(':core') { apply plugin: 'scala' archivesBaseName = "kafka_${baseScalaVersion}" - def (major, minor, trivial) = scalaVersion.tokenize('.') - dependencies { compile project(':clients') compile project(':log4j-appender') @@ -235,19 +233,19 @@ project(':core') { compile 'com.101tec:zkclient:0.5' compile 'com.yammer.metrics:metrics-core:2.2.0' compile 'net.sf.jopt-simple:jopt-simple:3.2' + if (scalaVersion.startsWith('2.11')) { + compile 'org.scala-lang.modules:scala-xml_2.11:1.0.3' + compile 'org.scala-lang.modules:scala-parser-combinators_2.11:1.0.3' + } testCompile 'junit:junit:4.6' testCompile 'org.easymock:easymock:3.0' testCompile 'org.objenesis:objenesis:1.2' - if (scalaVersion.startsWith('2.10')) { - testCompile 'org.scalatest:scalatest_2.10:1.9.1' - } else if (scalaVersion.startsWith('2.11')) { - compile 'org.scala-lang.modules:scala-xml_2.11:1.0.3' - compile 'org.scala-lang.modules:scala-parser-combinators_2.11:1.0.3' - testCompile "org.scalatest:scalatest_2.11:2.2.0" - } else { - testCompile "org.scalatest:scalatest_$scalaVersion:1.8" - } + if (scalaVersion.startsWith('2.9')) + testCompile "org.scalatest:scalatest_$scalaVersion:1.9.1" + else + testCompile "org.scalatest:scalatest_$baseScalaVersion:2.2.5" + testRuntime "$slf4jlog4j" zinc 'com.typesafe.zinc:zinc:0.3.7'
