Repository: kafka Updated Branches: refs/heads/0.10.1 aec74ae5b -> 9ffadbfdc
KAFKA-4438; Cross compile to Scala 2.12.0 (cherry picked from commit f3aad3b54b7cbc5109d8398829a31100fd82b3e0) Author: Bernard Leach <leac...@bouncycastle.org> Reviewers: Guozhang Wang <wangg...@gmail.com> Closes #2164 from leachbj/0.10.1-2.12-backport Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/9ffadbfd Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/9ffadbfd Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/9ffadbfd Branch: refs/heads/0.10.1 Commit: 9ffadbfdc6f1b1fc47d48cbb7edf0f2f3a5f8f5e Parents: aec74ae Author: Bernard Leach <leac...@bouncycastle.org> Authored: Wed Nov 30 22:28:08 2016 -0800 Committer: Guozhang Wang <wangg...@gmail.com> Committed: Wed Nov 30 22:28:08 2016 -0800 ---------------------------------------------------------------------- build.gradle | 4 ++-- core/src/main/scala/kafka/utils/IteratorTemplate.scala | 2 +- gradle/dependencies.gradle | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/9ffadbfd/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 5e0e234..fded48e 100644 --- a/build.gradle +++ b/build.gradle @@ -313,7 +313,7 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) { task reportCoverage(dependsOn: ['jacocoRootReport', 'core:reportScoverage']) -for ( sv in ['2_10', '2_11'] ) { +for ( sv in ['2_10', '2_11', '2_12'] ) { String svInDot = sv.replaceAll( "_", ".") tasks.create(name: "jar_core_${sv}", type: GradleBuild) { @@ -505,7 +505,7 @@ project(':core') { task siteDocsTar(dependsOn: ['genProtocolErrorDocs', 'genProtocolApiKeyDocs', 'genProtocolMessageDocs', 'genProducerConfigDocs', 'genConsumerConfigDocs', 'genKafkaConfigDocs', - 'genTopicConfigDocs', ':connect:runtime:genConnectConfigDocs', + 'genTopicConfigDocs', ':connect:runtime:genConnectConfigDocs', ':streams:genStreamsConfigDocs'], type: Tar) { classifier = 'site-docs' compression = Compression.GZIP http://git-wip-us.apache.org/repos/asf/kafka/blob/9ffadbfd/core/src/main/scala/kafka/utils/IteratorTemplate.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/utils/IteratorTemplate.scala b/core/src/main/scala/kafka/utils/IteratorTemplate.scala index 8c44955..17c152d 100644 --- a/core/src/main/scala/kafka/utils/IteratorTemplate.scala +++ b/core/src/main/scala/kafka/utils/IteratorTemplate.scala @@ -75,7 +75,7 @@ abstract class IteratorTemplate[T] extends Iterator[T] with java.util.Iterator[T null.asInstanceOf[T] } - def remove = + override def remove = throw new UnsupportedOperationException("Removal not supported") protected def resetState() { http://git-wip-us.apache.org/repos/asf/kafka/blob/9ffadbfd/gradle/dependencies.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ab1d057..02a4cd9 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -39,9 +39,9 @@ versions += [ powermock: "1.6.4", reflections: "0.9.10", rocksDB: "4.9.0", - scalaTest: "2.2.6", + scalaTest: "3.0.1", scalaParserCombinators: "1.0.4", - scoverage: "1.1.1", + scoverage: "1.3.0", slf4j: "1.7.21", snappy: "1.1.2.6", zkclient: "0.9", @@ -51,11 +51,14 @@ versions += [ // Add Scala version def defaultScala210Version = '2.10.6' def defaultScala211Version = '2.11.8' +def defaultScala212Version = '2.12.0' if (hasProperty('scalaVersion')) { if (scalaVersion == '2.10') { versions["scala"] = defaultScala210Version } else if (scalaVersion == '2.11') { versions["scala"] = defaultScala211Version + } else if (scalaVersion == '2.12') { + versions["scala"] = defaultScala212Version } else { versions["scala"] = scalaVersion }
