diff --git a/app/build.gradle b/app/build.gradle index db97d1c9..1e4f7888 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,11 +67,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 encoding = 'utf-8' } - lintOptions { - disable 'MissingTranslation' - disable 'ExtraTranslation' - abortOnError false - } configurations.all { resolutionStrategy.force 'com.google.code.findbugs:jsr305:3.0.1' @@ -108,6 +103,10 @@ android { buildConfigField "String", "CHANNEL", '"coolapk"' } } + lint { + abortOnError false + disable 'MissingTranslation', 'ExtraTranslation' + } // 避免压缩TensorFlow // aaptOptions { // noCompress "tflite" diff --git a/autojs/build.gradle b/autojs/build.gradle index 6fc47747..e17ebffc 100644 --- a/autojs/build.gradle +++ b/autojs/build.gradle @@ -25,14 +25,14 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - lintOptions { - abortOnError false - } sourceSets { main { jniLibs.srcDirs = ['libs'] } } + lint { + abortOnError false + } } repositories { diff --git a/automator/build.gradle b/automator/build.gradle index 634f63ea..8ad2bbda 100644 --- a/automator/build.gradle +++ b/automator/build.gradle @@ -23,7 +23,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - lintOptions { + lint { abortOnError false } diff --git a/build.gradle b/build.gradle index 4c00dddf..24cc33d9 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { maven { url "https://maven.aliyun.com/repository/public" } } dependencies { - classpath 'com.android.tools.build:gradle:7.1.1' + classpath 'com.android.tools.build:gradle:7.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3' diff --git a/common/build.gradle b/common/build.gradle index d9aea477..90d390c7 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -20,7 +20,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - lintOptions { + lint { abortOnError false } diff --git a/inrt/build.gradle b/inrt/build.gradle index 449ff59a..0db8ed38 100644 --- a/inrt/build.gradle +++ b/inrt/build.gradle @@ -15,12 +15,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true } - lintOptions { - disable 'MissingTranslation' - disable 'ExtraTranslation' - - abortOnError false - } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -56,6 +50,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lint { + abortOnError false + disable 'MissingTranslation', 'ExtraTranslation' + } } def buildApkPluginForAbi(File pluginProjectDir, String abi) { diff --git a/js-supports/autojs-tool-color-center/build.gradle b/js-supports/autojs-tool-color-center/build.gradle index dc791f5c..bc9be87c 100644 --- a/js-supports/autojs-tool-color-center/build.gradle +++ b/js-supports/autojs-tool-color-center/build.gradle @@ -19,7 +19,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - lintOptions { + lint { abortOnError false } } diff --git a/js-supports/autojs-tool-common/build.gradle b/js-supports/autojs-tool-common/build.gradle index 344d4875..0ba88465 100644 --- a/js-supports/autojs-tool-common/build.gradle +++ b/js-supports/autojs-tool-common/build.gradle @@ -13,11 +13,11 @@ android { minifyEnabled false } } - - lintOptions { + lint { abortOnError false } + } diff --git a/js-supports/autojs-tool-download/build.gradle b/js-supports/autojs-tool-download/build.gradle index 94e7e578..9a44d466 100644 --- a/js-supports/autojs-tool-download/build.gradle +++ b/js-supports/autojs-tool-download/build.gradle @@ -15,11 +15,11 @@ android { minifyEnabled false } } - - lintOptions { + lint { abortOnError false } + } diff --git a/js-supports/autojs-tool-encrypt/build.gradle b/js-supports/autojs-tool-encrypt/build.gradle index cdeb31d2..68e1bd32 100644 --- a/js-supports/autojs-tool-encrypt/build.gradle +++ b/js-supports/autojs-tool-encrypt/build.gradle @@ -13,10 +13,10 @@ android { minifyEnabled false } } - - lintOptions { + lint { abortOnError false } + }