Add Docker image chip-build-java to build kotlin app (#25320)

* Add Docker image chip-build-java to build kotlin app * Update integrations/docker/images/chip-build/version Co-authored-by: Boris Zbarsky <bzbarsky@apple.com> * Add kotlin support to chip-build-vscode --------- Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
project-chip · Oct 6, 2023 · 4780947 · 4780947
1 parent 252e476
commit 4780947
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 1 deletion.
diff --git a/integrations/docker/images/chip-build-java/Dockerfile b/integrations/docker/images/chip-build-java/Dockerfile
@@ -0,0 +1,13 @@
+ARG VERSION=latest
+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 \
+    && unzip kotlin-compiler-*.zip \
+    && rm kotlin-compiler-*.zip \
+    && rm -f kotlinc/bin/*.bat \
+    && : # last line
+
+ENV PATH $PATH:/usr/lib/kotlinc/bin
diff --git a/integrations/docker/images/chip-build-java/build.sh b/integrations/docker/images/chip-build-java/build.sh
@@ -0,0 +1 @@
+../../build.sh
diff --git a/integrations/docker/images/chip-build-java/run.sh b/integrations/docker/images/chip-build-java/run.sh
@@ -0,0 +1 @@
+../../run.sh
diff --git a/integrations/docker/images/chip-build-java/version b/integrations/docker/images/chip-build-java/version
@@ -0,0 +1 @@
+../chip-build/version
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -61,6 +61,17 @@ RUN set -x \
     && chmod -R a+w /opt/android/sdk/licenses \
     && : # last line
 
+# 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 \
+    && unzip kotlin-compiler-*.zip \
+    && rm kotlin-compiler-*.zip \
+    && rm -f kotlinc/bin/*.bat \
+    && : # last line
+
+ENV PATH $PATH:/usr/lib/kotlinc/bin
+
 # Required for the Tizen SDK
 RUN set -x \
     && apt-get update \

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.6.41 Version bump reason: [K32W0] SDK 2.6.10 update
+0.6.42 Version bump reason: [Java] download and install kotlin compiler