From 88d56ed627096011c5f1d4bcd9d47fd7f20bd33a Mon Sep 17 00:00:00 2001 From: chengjunzhang61 Date: Thu, 2 Dec 2021 04:32:23 -0500 Subject: [PATCH] Update ndk version --- app-sample/build.gradle | 84 ++++++++++++++++++++--------------------- build.gradle | 1 + 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/app-sample/build.gradle b/app-sample/build.gradle index bfd97997..6e3d991a 100644 --- a/app-sample/build.gradle +++ b/app-sample/build.gradle @@ -13,7 +13,7 @@ def gitSha = { -> }.memoize() android { - + ndkVersion config['ndk-version'] compileSdkVersion config['compile-sdk'] buildToolsVersion config['build-tools'] @@ -59,47 +59,47 @@ android { } // do not sign in CI - if (!project.hasProperty('CI')) { - signingConfigs { - config { - - final def keystoreFile = project.file('keystore.jks') - final def keystoreFilePassword = 'MARKWON_KEYSTORE_FILE_PASSWORD' - final def keystoreAlias = 'MARKWON_KEY_ALIAS' - final def keystoreAliasPassword = 'MARKWON_KEY_ALIAS_PASSWORD' - - final def properties = [ - keystoreFilePassword, - keystoreAlias, - keystoreAliasPassword - ] - - if (!keystoreFile.exists()) { - throw new IllegalStateException("No '${keystoreFile.name}' file is found.") - } - - final def missingProperties = properties.findAll { !project.hasProperty(it) } - if (!missingProperties.isEmpty()) { - throw new IllegalStateException("Missing required signing properties: $missingProperties") - } - - storeFile keystoreFile - storePassword project[keystoreFilePassword] - - keyAlias project[keystoreAlias] - keyPassword project[keystoreAliasPassword] - } - } - - buildTypes { - debug { - signingConfig signingConfigs.config - } - release { - signingConfig signingConfigs.config - } - } - } +// if (!project.hasProperty('CI')) { +// signingConfigs { +// config { +// +// final def keystoreFile = project.file('keystore.jks') +// final def keystoreFilePassword = 'MARKWON_KEYSTORE_FILE_PASSWORD' +// final def keystoreAlias = 'MARKWON_KEY_ALIAS' +// final def keystoreAliasPassword = 'MARKWON_KEY_ALIAS_PASSWORD' +// +// final def properties = [ +// keystoreFilePassword, +// keystoreAlias, +// keystoreAliasPassword +// ] +// +// if (!keystoreFile.exists()) { +// throw new IllegalStateException("No '${keystoreFile.name}' file is found.") +// } +// +// final def missingProperties = properties.findAll { !project.hasProperty(it) } +// if (!missingProperties.isEmpty()) { +// throw new IllegalStateException("Missing required signing properties: $missingProperties") +// } +// +// storeFile keystoreFile +// storePassword project[keystoreFilePassword] +// +// keyAlias project[keystoreAlias] +// keyPassword project[keystoreAliasPassword] +// } +// } +// +// buildTypes { +// debug { +// signingConfig signingConfigs.config +// } +// release { +// signingConfig signingConfigs.config +// } +// } +// } } kapt { diff --git a/build.gradle b/build.gradle index 8d24619f..af8ec8a5 100644 --- a/build.gradle +++ b/build.gradle @@ -53,6 +53,7 @@ ext { 'compile-sdk' : 29, 'target-sdk' : 29, 'min-sdk' : 16, + 'ndk-version' : '21.4.7075529', 'push-aar-gradle': 'https://raw.githubusercontent.com/noties/gradle-mvn-push/master/gradle-mvn-push-aar.gradle' ]