Add kotlin compiler to docker image chip-build-android (#25418)

* Add kotlin compiler to docker image chip-build-android * copy over kotlinc and set path in vscode image --------- Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Sep 29, 2023 · 9029fb4 · 9029fb4
1 parent 24b1824
commit 9029fb4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/examples/android/CHIPTest/build.gradle b/examples/android/CHIPTest/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.5.10"
+    ext.kotlin_version = "1.8.10"
     repositories {
         google()
         mavenCentral()

diff --git a/examples/android/CHIPTool/build.gradle b/examples/android/CHIPTool/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.5.21'
+    ext.kotlin_version = '1.8.10'
     repositories {
         google()
         mavenCentral()

diff --git a/integrations/docker/images/chip-build-android/Dockerfile b/integrations/docker/images/chip-build-android/Dockerfile
@@ -1,5 +1,5 @@
 ARG VERSION=latest
-FROM connectedhomeip/chip-build:${VERSION}
+FROM connectedhomeip/chip-build-java:${VERSION}
 
 # JDK 8 access
 # JDK 8 is required because Android `sdkmanager`

diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -28,6 +28,7 @@ COPY --from=nrf /opt/NordicSemiconductor/nrfconnect /opt/NordicSemiconductor/nrf
 
 COPY --from=android /opt/android/sdk /opt/android/sdk
 COPY --from=android /opt/android/android-ndk-r21b /opt/android/android-ndk-r21b
+COPY --from=android /usr/lib/kotlinc/bin /usr/lib/kotlinc/bin
 
 COPY --from=mbedos /opt/openocd/ /opt/openocd/
 
@@ -61,17 +62,6 @@ 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.8.10/kotlin-compiler-1.8.10.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 \
@@ -97,6 +87,7 @@ RUN set -x \
     && pip3 install bflb-iot-tool \
     && : # last line
 
+ENV PATH $PATH:/usr/lib/kotlinc/bin
 ENV AMEBA_PATH=/opt/ameba/ambd_sdk_with_chip_non_NDA
 ENV ANDROID_HOME=/opt/android/sdk
 ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r21b

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.6.45 Version bump reason: [Telink] Update Telink Docker image (Zephyr update)
+0.6.46 Version bump reason: [Android] Add kotlin compiler version 1.8.10
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0.6.45 Version bump reason: [Telink] Update Telink Docker image (Zephyr update)
		0.6.46 Version bump reason: [Android] Add kotlin compiler version 1.8.10