From ca506e1ed34fe02c2896d15acf9730e0e1ebab3e Mon Sep 17 00:00:00 2001 From: Joonhaeng Heo Date: Tue, 11 Jun 2024 14:24:58 +0900 Subject: [PATCH 01/15] Update Kotlin / gradle version in Android Chiptool --- examples/android/CHIPTool/build.gradle | 4 ++-- .../android/CHIPTool/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/android/CHIPTool/build.gradle b/examples/android/CHIPTool/build.gradle index 01e651929f8ec6..bda89b123d6c3d 100644 --- a/examples/android/CHIPTool/build.gradle +++ b/examples/android/CHIPTool/build.gradle @@ -1,12 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.8.10' + ext.kotlin_version = '2.0.0' repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.2.0" + classpath "com.android.tools.build:gradle:7.1.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties b/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties index 05679dc3c18669..ffed3a254e91df 100644 --- a/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties +++ b/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From e29882fe375ae2203106e920fffa01d68f3c32d2 Mon Sep 17 00:00:00 2001 From: Joonhaeng Heo Date: Fri, 10 Jan 2025 08:10:09 +0900 Subject: [PATCH 02/15] Change Java version --- integrations/docker/images/chip-cert-bins/Dockerfile | 4 ++-- .../docker/images/vscode/chip-build-vscode/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index ef823f7eeb674d..5323f282539b58 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -78,7 +78,7 @@ RUN set -x \ make \ net-tools \ ninja-build \ - openjdk-8-jdk \ + openjdk-11-jdk \ pkg-config \ python3 \ python3-dev \ @@ -302,7 +302,7 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requir RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requirements.txt # PIP requires MASON package compilation, which seems to require a JDK -RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get update; apt-get install -fy openjdk-8-jdk +RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get update; apt-get install -fy openjdk-11-jdk RUN pip install --break-system-packages --no-cache-dir \ python_lib/obj/src/python_testing/matter_testing_infrastructure/chip-testing._build_wheel/chip_testing-*.whl \ diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index a9a2c9d690e24a..57cebf4c64569e 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -91,7 +91,7 @@ RUN set -x \ # - telnet # - srecord # For java builds: -# - openjdk-8-jdk +# - openjdk-11-jdk RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ @@ -99,7 +99,7 @@ RUN set -x \ expect \ telnet \ srecord \ - openjdk-8-jdk \ + openjdk-11-jdk \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line From 87fd7434cacbbf08b16406fdac789edb9026bb52 Mon Sep 17 00:00:00 2001 From: Joonhaeng Heo Date: Fri, 17 Jan 2025 10:42:26 +0900 Subject: [PATCH 03/15] Update to Java 11 --- .github/workflows/full-android.yaml | 2 +- .github/workflows/smoketest-android.yaml | 2 +- integrations/docker/images/chip-cert-bins/Dockerfile | 4 ++-- integrations/docker/images/stage-2/chip-build-java/Dockerfile | 2 +- .../docker/images/stage-3/chip-build-android/Dockerfile | 2 +- .../docker/images/vscode/chip-build-vscode/Dockerfile | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index d672632edfc6e2..aa69ff3665d6fd 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -33,7 +33,7 @@ jobs: name: Run env: - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64/ + JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/ runs-on: ubuntu-latest if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 58226ceb4839de..b7c073dd262df9 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -31,7 +31,7 @@ jobs: name: Smoke Run - Android env: - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64/ + JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/ runs-on: ubuntu-latest if: github.actor != 'restyled-io[bot]' diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile index 5323f282539b58..ef823f7eeb674d 100644 --- a/integrations/docker/images/chip-cert-bins/Dockerfile +++ b/integrations/docker/images/chip-cert-bins/Dockerfile @@ -78,7 +78,7 @@ RUN set -x \ make \ net-tools \ ninja-build \ - openjdk-11-jdk \ + openjdk-8-jdk \ pkg-config \ python3 \ python3-dev \ @@ -302,7 +302,7 @@ COPY --from=chip-build-cert-bins /root/connectedhomeip/src/python_testing/requir RUN pip install --break-system-packages -r /tmp/requirements.txt && rm /tmp/requirements.txt # PIP requires MASON package compilation, which seems to require a JDK -RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get update; apt-get install -fy openjdk-11-jdk +RUN set -x && DEBIAN_FRONTEND=noninteractive apt-get update; apt-get install -fy openjdk-8-jdk RUN pip install --break-system-packages --no-cache-dir \ python_lib/obj/src/python_testing/matter_testing_infrastructure/chip-testing._build_wheel/chip_testing-*.whl \ diff --git a/integrations/docker/images/stage-2/chip-build-java/Dockerfile b/integrations/docker/images/stage-2/chip-build-java/Dockerfile index bda9cb3e9f3c0a..d5960e57d06849 100644 --- a/integrations/docker/images/stage-2/chip-build-java/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-java/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=2 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-3/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile index 219e6172902cc1..2579fbabd7af54 100644 --- a/integrations/docker/images/stage-3/chip-build-android/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-android/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=1 +ARG VERSION=2 FROM ghcr.io/project-chip/chip-build-java:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index 57cebf4c64569e..a9a2c9d690e24a 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -91,7 +91,7 @@ RUN set -x \ # - telnet # - srecord # For java builds: -# - openjdk-11-jdk +# - openjdk-8-jdk RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ @@ -99,7 +99,7 @@ RUN set -x \ expect \ telnet \ srecord \ - openjdk-11-jdk \ + openjdk-8-jdk \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line From 6a8aafde890c8979febf9feba59375bf1f58c631 Mon Sep 17 00:00:00 2001 From: Joonhaeng Heo Date: Wed, 22 Jan 2025 07:57:17 +0900 Subject: [PATCH 04/15] Revert Dockerfile Version --- integrations/docker/images/stage-2/chip-build-java/Dockerfile | 2 +- .../docker/images/stage-3/chip-build-android/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integrations/docker/images/stage-2/chip-build-java/Dockerfile b/integrations/docker/images/stage-2/chip-build-java/Dockerfile index d5960e57d06849..bda9cb3e9f3c0a 100644 --- a/integrations/docker/images/stage-2/chip-build-java/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-java/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=2 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip diff --git a/integrations/docker/images/stage-3/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile index 2579fbabd7af54..219e6172902cc1 100644 --- a/integrations/docker/images/stage-3/chip-build-android/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-android/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=2 +ARG VERSION=1 FROM ghcr.io/project-chip/chip-build-java:${VERSION} LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip From 7a8f1b3b633606c2878f66d633ba0c9323b96099 Mon Sep 17 00:00:00 2001 From: Joonhaeng Heo Date: Wed, 22 Jan 2025 08:25:08 +0900 Subject: [PATCH 05/15] Update version --- .github/workflows/java-tests.yaml | 2 +- .github/workflows/smoketest-android.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml index 7d5170c39bc5a3..de9b2f86f42607 100644 --- a/.github/workflows/java-tests.yaml +++ b/.github/workflows/java-tests.yaml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest container: - image: ghcr.io/project-chip/chip-build-java:97 + image: ghcr.io/project-chip/chip-build-java:99 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0" diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index b7c073dd262df9..e6d81815faadd0 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:97 + image: ghcr.io/project-chip/chip-build-android:99 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" From 33d225669c6ea8a326a77291f24da48cae952ad7 Mon Sep 17 00:00:00 2001 From: Joonhaeng Heo Date: Thu, 23 Jan 2025 14:50:51 +0900 Subject: [PATCH 06/15] install cmdline tools --- .../docker/images/stage-3/chip-build-android/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/integrations/docker/images/stage-3/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile index 219e6172902cc1..ea60b3db45074e 100644 --- a/integrations/docker/images/stage-3/chip-build-android/Dockerfile +++ b/integrations/docker/images/stage-3/chip-build-android/Dockerfile @@ -28,11 +28,11 @@ RUN set -x \ # Download and install android command line tool (for installing `sdkmanager`) RUN set -x \ - && wget -O /tmp/android-tools.zip https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip \ + && wget -O /tmp/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \ && cd /opt/android/sdk \ - && unzip /tmp/android-tools.zip \ - && rm -f /tmp/android-tools.zip \ - && test -d /opt/android/sdk/tools \ + && unzip /tmp/cmdline-tools.zip \ + && rm -f /tmp/cmdline-tools.zip \ + && test -d /opt/android/sdk/cmdline-tools \ && : # last line # Download and install android NDK From 045330b65b86685f17a6f33d42774c53a8e59512 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 31 Jan 2025 15:11:37 -0500 Subject: [PATCH 07/15] Use 105 image --- .github/workflows/full-android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 93431c9e692f2e..7ee48c8fa27070 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -39,7 +39,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:104 + image: ghcr.io/project-chip/chip-build-android:105 volumes: - "/tmp/log_output:/tmp/test_logs" From 2406849fb2e37af490e84d4ba6518a27235214bd Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Fri, 31 Jan 2025 15:11:53 -0500 Subject: [PATCH 08/15] Update smoketest-android.yaml --- .github/workflows/smoketest-android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 9546cf03e98748..6d15fcf2995b23 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:104 + image: ghcr.io/project-chip/chip-build-android:105 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" From 864dc0e5a9ffe167f392ca0adb839dc66aa449fb Mon Sep 17 00:00:00 2001 From: yunhanw-google Date: Fri, 31 Jan 2025 16:04:39 -0800 Subject: [PATCH 09/15] Update android.py with latest sdk path --- scripts/build/builders/android.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py index 3f640177f190ad..a82e6c19da157b 100644 --- a/scripts/build/builders/android.py +++ b/scripts/build/builders/android.py @@ -164,9 +164,9 @@ def validate_build_environment(self): os.environ["ANDROID_HOME"], "tools", "bin", "sdkmanager" ) - # New SDK manager at cmdline-tools/latest/bin/ + # New SDK manager at cmdline-tools/bin/ new_sdk_manager = os.path.join( - os.environ["ANDROID_HOME"], "cmdline-tools", "latest", "bin", "sdkmanager" + os.environ["ANDROID_HOME"], "cmdline-tools", "bin", "sdkmanager" ) if not ( os.path.isfile(sdk_manager) and os.access(sdk_manager, os.X_OK) @@ -413,7 +413,6 @@ def generate(self): new_sdk_manager = os.path.join( os.environ["ANDROID_HOME"], "cmdline-tools", - "latest", "bin", "sdkmanager", ) From 925ff6aa39678608961f01f432d9be72022326a4 Mon Sep 17 00:00:00 2001 From: yunhanw Date: Fri, 31 Jan 2025 18:39:06 -0800 Subject: [PATCH 10/15] Revert "Update android.py with latest sdk path" This reverts commit 864dc0e5a9ffe167f392ca0adb839dc66aa449fb. --- scripts/build/builders/android.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/build/builders/android.py b/scripts/build/builders/android.py index a82e6c19da157b..3f640177f190ad 100644 --- a/scripts/build/builders/android.py +++ b/scripts/build/builders/android.py @@ -164,9 +164,9 @@ def validate_build_environment(self): os.environ["ANDROID_HOME"], "tools", "bin", "sdkmanager" ) - # New SDK manager at cmdline-tools/bin/ + # New SDK manager at cmdline-tools/latest/bin/ new_sdk_manager = os.path.join( - os.environ["ANDROID_HOME"], "cmdline-tools", "bin", "sdkmanager" + os.environ["ANDROID_HOME"], "cmdline-tools", "latest", "bin", "sdkmanager" ) if not ( os.path.isfile(sdk_manager) and os.access(sdk_manager, os.X_OK) @@ -413,6 +413,7 @@ def generate(self): new_sdk_manager = os.path.join( os.environ["ANDROID_HOME"], "cmdline-tools", + "latest", "bin", "sdkmanager", ) From 0d1fa01108b4826e4ac53da274c6c70e94abbf61 Mon Sep 17 00:00:00 2001 From: yunhanw Date: Fri, 31 Jan 2025 18:43:05 -0800 Subject: [PATCH 11/15] Fix compilation errors -- Use docker 106 -- Remove unsupported -XX:MaxPermSize=2048m -- Update java version --- .github/workflows/full-android.yaml | 4 ++-- .github/workflows/smoketest-android.yaml | 4 ++-- examples/android/CHIPTest/gradle.properties | 2 +- examples/android/CHIPTool/gradle.properties | 2 +- examples/tv-app/android/App/gradle.properties | 3 +-- examples/tv-casting-app/android/App/gradle.properties | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 7ee48c8fa27070..e8af7a49665b8b 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -33,13 +33,13 @@ jobs: name: Run env: - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/ + JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64/ runs-on: ubuntu-latest if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:105 + image: ghcr.io/project-chip/chip-build-android:106 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index 6d15fcf2995b23..95fe2b864e9e7b 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -31,13 +31,13 @@ jobs: name: Smoke Run - Android env: - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64/ + JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64/ runs-on: ubuntu-latest if: github.actor != 'restyled-io[bot]' container: - image: ghcr.io/project-chip/chip-build-android:105 + image: ghcr.io/project-chip/chip-build-android:106 volumes: - "/:/runner-root-volume" - "/tmp/log_output:/tmp/test_logs" diff --git a/examples/android/CHIPTest/gradle.properties b/examples/android/CHIPTest/gradle.properties index a85d072fd2e1ed..0fb7a4bde02955 100644 --- a/examples/android/CHIPTest/gradle.properties +++ b/examples/android/CHIPTest/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/examples/android/CHIPTool/gradle.properties b/examples/android/CHIPTool/gradle.properties index 71f72db8c81ef2..dbf2f4443b2778 100644 --- a/examples/android/CHIPTool/gradle.properties +++ b/examples/android/CHIPTool/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/examples/tv-app/android/App/gradle.properties b/examples/tv-app/android/App/gradle.properties index 7357abbe5e28e8..44d1a678300aaa 100644 --- a/examples/tv-app/android/App/gradle.properties +++ b/examples/tv-app/android/App/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects @@ -24,4 +24,3 @@ matterSdkSourceBuild=false # example) to build SDK from source code and debug in Android Studio. # Set to blank to use the SDK prebuilt by scripts/build/build_examples.py. matterBuildSrcDir=out/android-arm64-chip-tvserver - diff --git a/examples/tv-casting-app/android/App/gradle.properties b/examples/tv-casting-app/android/App/gradle.properties index 9bf7e81826e3d7..a4b1a339862234 100644 --- a/examples/tv-casting-app/android/App/gradle.properties +++ b/examples/tv-casting-app/android/App/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects From 4e063582d1273eae2e44b64cf12cb5d471ba74c7 Mon Sep 17 00:00:00 2001 From: yunhanw Date: Mon, 3 Feb 2025 09:36:22 -0800 Subject: [PATCH 12/15] bump classpath gradle to 7.1.3 for other android build --- examples/android/CHIPTest/build.gradle | 2 +- examples/tv-app/android/App/build.gradle | 2 +- examples/tv-casting-app/android/App/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/android/CHIPTest/build.gradle b/examples/android/CHIPTest/build.gradle index edbb8003b1fca6..fe25813485df9b 100644 --- a/examples/android/CHIPTest/build.gradle +++ b/examples/android/CHIPTest/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.2.2" + classpath "com.android.tools.build:gradle:7.1.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/tv-app/android/App/build.gradle b/examples/tv-app/android/App/build.gradle index 42bb88d287a3d1..702ed20465261e 100644 --- a/examples/tv-app/android/App/build.gradle +++ b/examples/tv-app/android/App/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/examples/tv-casting-app/android/App/build.gradle b/examples/tv-casting-app/android/App/build.gradle index 79c656c2ab4cc1..39f7c41af45435 100644 --- a/examples/tv-casting-app/android/App/build.gradle +++ b/examples/tv-casting-app/android/App/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From c95d7185f36ce361c2684cab6687652623ef94d2 Mon Sep 17 00:00:00 2001 From: yunhanw Date: Mon, 3 Feb 2025 10:30:41 -0800 Subject: [PATCH 13/15] update the rest gradle across tress --- examples/android/CHIPTest/build.gradle | 2 +- .../android/CHIPTest/gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/CHIPTool/gradle/wrapper/gradle-wrapper.properties | 2 +- examples/tv-app/android/App/build.gradle | 2 +- .../tv-app/android/App/gradle/wrapper/gradle-wrapper.properties | 2 +- .../android_deps/gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/android/CHIPTest/build.gradle b/examples/android/CHIPTest/build.gradle index fe25813485df9b..c8bc7b42700d05 100644 --- 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.8.10" + ext.kotlin_version = "2.0.0" repositories { google() mavenCentral() diff --git a/examples/android/CHIPTest/gradle/wrapper/gradle-wrapper.properties b/examples/android/CHIPTest/gradle/wrapper/gradle-wrapper.properties index f24728e6c60540..795d316d2f0075 100644 --- a/examples/android/CHIPTest/gradle/wrapper/gradle-wrapper.properties +++ b/examples/android/CHIPTest/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon Aug 16 17:10:29 CST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties b/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties index ffed3a254e91df..2e6e5897b5285c 100644 --- a/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties +++ b/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/tv-app/android/App/build.gradle b/examples/tv-app/android/App/build.gradle index 702ed20465261e..c3d68cd3a08d4e 100644 --- a/examples/tv-app/android/App/build.gradle +++ b/examples/tv-app/android/App/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.9.20' + ext.kotlin_version = '2.0.0' repositories { google() mavenCentral() diff --git a/examples/tv-app/android/App/gradle/wrapper/gradle-wrapper.properties b/examples/tv-app/android/App/gradle/wrapper/gradle-wrapper.properties index da67dc800c423c..45cc74c0d945aa 100644 --- a/examples/tv-app/android/App/gradle/wrapper/gradle-wrapper.properties +++ b/examples/tv-app/android/App/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 26 11:10:18 CST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/third_party/android_deps/gradle/wrapper/gradle-wrapper.properties b/third_party/android_deps/gradle/wrapper/gradle-wrapper.properties index ffed3a254e91df..2e6e5897b5285c 100644 --- a/third_party/android_deps/gradle/wrapper/gradle-wrapper.properties +++ b/third_party/android_deps/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 1cd60b06756449eec3da15d7c2130519a880124c Mon Sep 17 00:00:00 2001 From: yunhanw Date: Mon, 3 Feb 2025 11:18:33 -0800 Subject: [PATCH 14/15] bump class path to 7.3.3 as well --- examples/android/CHIPTest/build.gradle | 2 +- examples/android/CHIPTool/build.gradle | 2 +- examples/tv-app/android/App/build.gradle | 2 +- examples/tv-casting-app/android/App/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/android/CHIPTest/build.gradle b/examples/android/CHIPTest/build.gradle index c8bc7b42700d05..0465a85ff7a5af 100644 --- a/examples/android/CHIPTest/build.gradle +++ b/examples/android/CHIPTest/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.1.3" + classpath "com.android.tools.build:gradle:7.3.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/android/CHIPTool/build.gradle b/examples/android/CHIPTool/build.gradle index bda89b123d6c3d..fd3ccc09e5f24f 100644 --- a/examples/android/CHIPTool/build.gradle +++ b/examples/android/CHIPTool/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.1.3" + classpath "com.android.tools.build:gradle:7.3.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/tv-app/android/App/build.gradle b/examples/tv-app/android/App/build.gradle index c3d68cd3a08d4e..bc014acc889790 100644 --- a/examples/tv-app/android/App/build.gradle +++ b/examples/tv-app/android/App/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.3.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/examples/tv-casting-app/android/App/build.gradle b/examples/tv-casting-app/android/App/build.gradle index 39f7c41af45435..e34b313a149269 100644 --- a/examples/tv-casting-app/android/App/build.gradle +++ b/examples/tv-casting-app/android/App/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From f6be2ea97ab8ad78d0f44eba6d29e81db809c29c Mon Sep 17 00:00:00 2001 From: yunhanw Date: Mon, 3 Feb 2025 11:35:37 -0800 Subject: [PATCH 15/15] Revert "bump class path to 7.3.3 as well" This reverts commit 1cd60b06756449eec3da15d7c2130519a880124c. --- examples/android/CHIPTest/build.gradle | 2 +- examples/android/CHIPTool/build.gradle | 2 +- examples/tv-app/android/App/build.gradle | 2 +- examples/tv-casting-app/android/App/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/android/CHIPTest/build.gradle b/examples/android/CHIPTest/build.gradle index 0465a85ff7a5af..c8bc7b42700d05 100644 --- a/examples/android/CHIPTest/build.gradle +++ b/examples/android/CHIPTest/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.3.3" + classpath "com.android.tools.build:gradle:7.1.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/android/CHIPTool/build.gradle b/examples/android/CHIPTool/build.gradle index fd3ccc09e5f24f..bda89b123d6c3d 100644 --- a/examples/android/CHIPTool/build.gradle +++ b/examples/android/CHIPTool/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:7.3.3" + classpath "com.android.tools.build:gradle:7.1.3" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/tv-app/android/App/build.gradle b/examples/tv-app/android/App/build.gradle index bc014acc889790..c3d68cd3a08d4e 100644 --- a/examples/tv-app/android/App/build.gradle +++ b/examples/tv-app/android/App/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.3' + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/examples/tv-casting-app/android/App/build.gradle b/examples/tv-casting-app/android/App/build.gradle index e34b313a149269..39f7c41af45435 100644 --- a/examples/tv-casting-app/android/App/build.gradle +++ b/examples/tv-casting-app/android/App/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.3.3' + classpath 'com.android.tools.build:gradle:7.1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files