diff --git a/app/build.gradle b/app/build.gradle index 58818af5..280aa300 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,11 +18,6 @@ android { } } - lintOptions { - abortOnError false - checkReleaseBuilds true - disable 'MissingTranslation', 'GoogleAppIndexingWarning' - } compileSdkVersion 31 buildToolsVersion "31.0.0" @@ -50,14 +45,13 @@ android { sourceSets { main.java.srcDirs += 'src/main/kotlin' } - packagingOptions { - pickFirst 'META-INF/core_debug.kotlin_module' - pickFirst 'META-INF/core_release.kotlin_module' - pickFirst 'META-INF/library_debug.kotlin_module' - pickFirst 'META-INF/library_release.kotlin_module' + resources { + pickFirsts += ['META-INF/core_debug.kotlin_module', 'META-INF/core_release.kotlin_module', 'META-INF/library_debug.kotlin_module', 'META-INF/library_release.kotlin_module'] + } } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -66,6 +60,11 @@ android { kotlinOptions { jvmTarget = '1.8' } + lint { + abortOnError false + checkReleaseBuilds true + disable 'MissingTranslation', 'GoogleAppIndexingWarning' + } } dependencies { diff --git a/build.gradle b/build.gradle index 88210423..3cbace78 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 21451bc6..3b25474e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip