From f5c42e2f931e4e0f0fc88cbd6c3a581f6f609a2d Mon Sep 17 00:00:00 2001 From: luozhl Date: Fri, 12 Jan 2024 15:36:24 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20fix=20build=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 +++ gradle.properties | 2 +- local.properties | 5 ++--- termexec/build.gradle | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d576ffd4..7bbbb960 100644 --- a/build.gradle +++ b/build.gradle @@ -96,6 +96,9 @@ ext { compileSdkVersion = 28 buildToolsVersion = '28.0.3' + ndkVersion = "22.1.7171670" + + // firebase related https://firebase.google.com/docs/android/setup firebaseCore = "com.google.firebase:firebase-core:16.0.6" firebaseMsg = "com.google.firebase:firebase-messaging:17.3.4" diff --git a/gradle.properties b/gradle.properties index 12d6a46b..52c00384 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Sun May 29 21:58:12 CST 2016 -org.gradle.jvmargs=-Xmx2048m +org.gradle.jvmargs = -Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED org.gradle.daemon=true android.debug.obsoleteApi=true #android.useDeprecatedNdk=true diff --git a/local.properties b/local.properties index 4929a5a2..3b77dc57 100644 --- a/local.properties +++ b/local.properties @@ -4,6 +4,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Thu Aug 02 10:23:49 CST 2018 -ndk.dir=/Users/yanhecun/Library/Android/sdk/ndk-bundle -sdk.dir=/Users/yanhecun/Library/Android/sdk +#Fri Jan 12 15:03:32 CST 2024 +sdk.dir=/Users/aaron/Documents/androidSDK diff --git a/termexec/build.gradle b/termexec/build.gradle index 03a46484..14530ac8 100644 --- a/termexec/build.gradle +++ b/termexec/build.gradle @@ -17,6 +17,7 @@ repositories { android { compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion rootProject.ext.buildToolsVersion + ndkVersion rootProject.ext.ndkVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.minSdkVersion