diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index e8ac6d90469f55..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-8-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:104 + 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 9d98d0faaca4b7..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-8-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:98 + 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/build.gradle b/examples/android/CHIPTest/build.gradle index edbb8003b1fca6..c8bc7b42700d05 100644 --- a/examples/android/CHIPTest/build.gradle +++ b/examples/android/CHIPTest/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.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/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/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/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.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/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties b/examples/android/CHIPTool/gradle/wrapper/gradle-wrapper.properties index 05679dc3c18669..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.1.1-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 42bb88d287a3d1..c3d68cd3a08d4e 100644 --- a/examples/tv-app/android/App/build.gradle +++ b/examples/tv-app/android/App/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.9.20' + ext.kotlin_version = '2.0.0' repositories { google() 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-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-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/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 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 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