Update Kotlin and Gradle plugin to latest version and add Android linter to linting workflow

This commit is contained in:
Niels van Velzen committed 2021-05-05 17:41:18 +02:00
1 parent 1f81afd449
commit 69472cd50a
4 files changed
+7 -12

No files matched your search

+2 -2
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 task
run: ./gradlew --build-cache --no-daemon --info detekt lint
- name: Upload SARIF files
uses: github/codeql-action/upload-sarif@v1
if: ${{ always() }}
+3 -8
View File
@@ -21,14 +21,9 @@ android {
viewBinding = true
}
compileOptions {
// Use Java 1.8 features
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = compileOptions.targetCompatibility.toString()
lintOptions {
isAbortOnError = false
sarifReport = true
}
buildTypes {
+1 -1
View File
@@ -6,7 +6,7 @@ buildscript {
dependencies {
val kotlinVersion: String by project
classpath("com.android.tools.build:gradle:4.1.3")
classpath("com.android.tools.build:gradle:4.2.0")
classpath(kotlin("gradle-plugin", kotlinVersion))
classpath(kotlin("serialization", kotlinVersion))
}
+1 -1
View File
@@ -2,7 +2,7 @@
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m
# Kotlin version
kotlinVersion=1.4.31
kotlinVersion=1.5.0
# Kotlin compiler
kotlin.incremental=true