[kafka] branch trunk updated: MINOR: Update Scala to 2.13.5 (#10169)

[ij...@apache.org]

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

ijuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new dd34e40  MINOR: Update Scala to 2.13.5 (#10169)
dd34e40 is described below

commit dd34e40f3e8ea097374654e8afea7dabc050272d
Author: Ismael Juma <is...@juma.me.uk>
AuthorDate: Mon Feb 22 22:02:38 2021 -0800

    MINOR: Update Scala to 2.13.5 (#10169)
    
    This includes a fix from Chia-Ping that removes tuple
    allocations when `Map.forKeyValue` is used
    (https://github.com/scala/scala/pull/9425) and support
    for JDK 16.
    
    Release notes:
    https://github.com/scala/scala/releases/tag/v2.13.5
    
    Reviewers: Chia-Ping Tsai <ch...@gmail.com>
---
 bin/kafka-run-class.sh          | 2 +-
 bin/windows/kafka-run-class.bat | 2 +-
 gradle.properties               | 2 +-
 gradle/dependencies.gradle      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/kafka-run-class.sh b/bin/kafka-run-class.sh
index f485f5b..0d32285 100755
--- a/bin/kafka-run-class.sh
+++ b/bin/kafka-run-class.sh
@@ -48,7 +48,7 @@ should_include_file() {
 base_dir=$(dirname $0)/..
 
 if [ -z "$SCALA_VERSION" ]; then
-  SCALA_VERSION=2.13.4
+  SCALA_VERSION=2.13.5
   if [[ -f "$base_dir/gradle.properties" ]]; then
     SCALA_VERSION=`grep "^scalaVersion=" "$base_dir/gradle.properties" | cut -d= -f 2`
   fi
diff --git a/bin/windows/kafka-run-class.bat b/bin/windows/kafka-run-class.bat
index 3490588..5c69c10 100755
--- a/bin/windows/kafka-run-class.bat
+++ b/bin/windows/kafka-run-class.bat
@@ -27,7 +27,7 @@ set BASE_DIR=%CD%
 popd
 
 IF ["%SCALA_VERSION%"] EQU [""] (
-  set SCALA_VERSION=2.13.4
+  set SCALA_VERSION=2.13.5
 )
 
 IF ["%SCALA_BINARY_VERSION%"] EQU [""] (
diff --git a/gradle.properties b/gradle.properties
index 9ea539c..c3de576 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ group=org.apache.kafka
 #  - tests/kafkatest/version.py (variable DEV_VERSION)
 #  - kafka-merge-pr.py
 version=2.9.0-SNAPSHOT
-scalaVersion=2.13.4
+scalaVersion=2.13.5
 task=build
 org.gradle.jvmargs=-Xmx2g -Xss4m -XX:+UseParallelGC
 org.gradle.parallel=true
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 2606ea4..a81a05c 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -28,7 +28,7 @@ ext {
 
 // Add Scala version
 def defaultScala212Version = '2.12.13'
-def defaultScala213Version = '2.13.4'
+def defaultScala213Version = '2.13.5'
 if (hasProperty('scalaVersion')) {
   if (scalaVersion == '2.12') {
     versions["scala"] = defaultScala212Version