Merge pull request #237 from nielsvanvelzen/android-gradle-plugin-4-2

Update Android Gradle plugin to 4.2
This commit is contained in:
Max Rumpf 2021-05-05 12:35:57 +02:00 committed by GitHub
commit 453a1b949d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions

View File

@ -27,8 +27,8 @@ jobs:
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Run detekt task
run: ./gradlew --build-cache --no-daemon --info detekt
- name: Run detekt and lint tasks
run: ./gradlew --build-cache --no-daemon --info detekt lint
- name: Upload SARIF files
uses: github/codeql-action/upload-sarif@v1
if: ${{ always() }}

View File

@ -12,7 +12,7 @@ object Plugins {
const val detekt = "1.17.0-RC2"
const val nexusPublish = "1.0.0"
const val dokka = "1.4.30"
const val androidBuildTools = "4.1.2"
const val androidBuildTools = "4.2.0"
}
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"

View File

@ -16,9 +16,6 @@ android {
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
@ -39,6 +36,7 @@ android {
lintOptions {
isAbortOnError = false
sarifReport = true
}
}