From 4d8809d5077fce482e398608f87323e6ed1d5e2a Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Mon, 27 Feb 2023 14:21:45 -0800 Subject: [PATCH 1/2] Add dependent lib kotlin-stdlib for kotlin version of java-matter-controller --- third_party/java_deps/BUILD.gn | 4 ++++ third_party/java_deps/set_up_java_deps.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/third_party/java_deps/BUILD.gn b/third_party/java_deps/BUILD.gn index ffcd48dfe5fe3c..434d205c6bbb6f 100644 --- a/third_party/java_deps/BUILD.gn +++ b/third_party/java_deps/BUILD.gn @@ -24,3 +24,7 @@ java_prebuilt("annotation") { java_prebuilt("json") { jar_path = "artifacts/json-20220924.jar" } + +java_prebuilt("kotlin-stdlib") { + jar_path = "artifacts/kotlin-stdlib-1.3.31.jar" +} diff --git a/third_party/java_deps/set_up_java_deps.sh b/third_party/java_deps/set_up_java_deps.sh index e0210b3bfacdff..8f9699d941c7c8 100755 --- a/third_party/java_deps/set_up_java_deps.sh +++ b/third_party/java_deps/set_up_java_deps.sh @@ -19,3 +19,4 @@ mkdir -p third_party/java_deps/artifacts curl --fail --location --silent --show-error https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar -o third_party/java_deps/artifacts/jsr305-3.0.2.jar curl --fail --location --silent --show-error https://repo1.maven.org/maven2/org/json/json/20220924/json-20220924.jar -o third_party/java_deps/artifacts/json-20220924.jar +curl --fail --location --silent --show-error https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.jar -o third_party/java_deps/artifacts/kotlin-stdlib-1.3.31.jar From 1347b92ed26464766df645953737ae5bbb6fcaaa Mon Sep 17 00:00:00 2001 From: Yufeng Wang Date: Mon, 27 Feb 2023 19:10:21 -0800 Subject: [PATCH 2/2] Update kotlin version to 1.8.10 --- integrations/docker/images/chip-build-java/Dockerfile | 2 +- integrations/docker/images/chip-build-vscode/Dockerfile | 2 +- integrations/docker/images/chip-build/version | 2 +- third_party/java_deps/BUILD.gn | 2 +- third_party/java_deps/set_up_java_deps.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integrations/docker/images/chip-build-java/Dockerfile b/integrations/docker/images/chip-build-java/Dockerfile index 5411af497c6a18..8329fb5dabd05e 100644 --- a/integrations/docker/images/chip-build-java/Dockerfile +++ b/integrations/docker/images/chip-build-java/Dockerfile @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION} # Download and install kotlin compiler RUN set -x \ && cd /usr/lib \ - && wget -q https://github.com/JetBrains/kotlin/releases/download/v1.3.31/kotlin-compiler-1.3.31.zip \ + && wget -q https://github.com/JetBrains/kotlin/releases/download/v1.8.10/kotlin-compiler-1.8.10.zip \ && unzip kotlin-compiler-*.zip \ && rm kotlin-compiler-*.zip \ && rm -f kotlinc/bin/*.bat \ diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile index 3c7f3e5bdd7e7a..5a8962b10aa4b6 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -64,7 +64,7 @@ RUN set -x \ # Download and install kotlin compiler RUN set -x \ && cd /usr/lib \ - && wget -q https://github.com/JetBrains/kotlin/releases/download/v1.3.31/kotlin-compiler-1.3.31.zip \ + && wget -q https://github.com/JetBrains/kotlin/releases/download/v1.8.10/kotlin-compiler-1.8.10.zip \ && unzip kotlin-compiler-*.zip \ && rm kotlin-compiler-*.zip \ && rm -f kotlinc/bin/*.bat \ diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index f3c882f289ca7a..28bc70ad831983 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.6.43 Version bump reason: Update Tizen SDK version to 7.0 +0.6.44 Version bump reason: [Java] update kotlin compiler version to 1.8.10 diff --git a/third_party/java_deps/BUILD.gn b/third_party/java_deps/BUILD.gn index 434d205c6bbb6f..d265a43b33a6fe 100644 --- a/third_party/java_deps/BUILD.gn +++ b/third_party/java_deps/BUILD.gn @@ -26,5 +26,5 @@ java_prebuilt("json") { } java_prebuilt("kotlin-stdlib") { - jar_path = "artifacts/kotlin-stdlib-1.3.31.jar" + jar_path = "artifacts/kotlin-stdlib-1.8.10.jar" } diff --git a/third_party/java_deps/set_up_java_deps.sh b/third_party/java_deps/set_up_java_deps.sh index 8f9699d941c7c8..6098e956718055 100755 --- a/third_party/java_deps/set_up_java_deps.sh +++ b/third_party/java_deps/set_up_java_deps.sh @@ -19,4 +19,4 @@ mkdir -p third_party/java_deps/artifacts curl --fail --location --silent --show-error https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar -o third_party/java_deps/artifacts/jsr305-3.0.2.jar curl --fail --location --silent --show-error https://repo1.maven.org/maven2/org/json/json/20220924/json-20220924.jar -o third_party/java_deps/artifacts/json-20220924.jar -curl --fail --location --silent --show-error https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.jar -o third_party/java_deps/artifacts/kotlin-stdlib-1.3.31.jar +curl --fail --location --silent --show-error https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.10/kotlin-stdlib-1.8.10.jar -o third_party/java_deps/artifacts/kotlin-stdlib-1.8.10.jar