From 0e20d156f1f54518ce2f6fe45b91d290b70febcd Mon Sep 17 00:00:00 2001 From: Satyajit Anand Date: Wed, 21 Jun 2023 15:23:39 +0530 Subject: [PATCH] chip-tool build support through openjdk 17 --- examples/android/CHIPTool/build.gradle | 4 ++-- examples/android/CHIPTool/gradle.properties | 2 +- .../android/CHIPTool/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/android/CHIPTool/build.gradle b/examples/android/CHIPTool/build.gradle index 01e651929f8ec6..6a52deebb6d9a3 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 = '1.7.21' repositories { google() mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.2.0" + classpath "com.android.tools.build:gradle:7.3.0" 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..f42e62f3724e4d 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.6-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists