Add dependent lib kotlin-stdlib for kotlin version of java-matter-con…

…troller (#25358) * Add dependent lib kotlin-stdlib for kotlin version of java-matter-controller * Update kotlin version to 1.8.10
project-chip · Jun 23, 2023 · 2372483 · 2372483
1 parent ce5ee8b
commit 2372483
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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.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
@@ -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.8.10/kotlin-stdlib-1.8.10.jar -o third_party/java_deps/artifacts/kotlin-stdlib-1.8.10.jar
Original file line number	Diff line number	Diff line change
		@@ -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