Browse Source

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 <chia7712@gmail.com>
pull/10188/head
Ismael Juma 4 years ago committed by GitHub
parent
commit
dd34e40f3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      bin/kafka-run-class.sh
  2. 2
      bin/windows/kafka-run-class.bat
  3. 2
      gradle.properties
  4. 2
      gradle/dependencies.gradle

2
bin/kafka-run-class.sh

@ -48,7 +48,7 @@ should_include_file() { @@ -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

2
bin/windows/kafka-run-class.bat

@ -27,7 +27,7 @@ set BASE_DIR=%CD% @@ -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 [""] (

2
gradle.properties

@ -21,7 +21,7 @@ group=org.apache.kafka @@ -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

2
gradle/dependencies.gradle

@ -28,7 +28,7 @@ ext { @@ -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

Loading…
Cancel
Save