Merge pull request #304 from cyb3rko/update-build

Update build components
This commit is contained in:
Jannis Mattheis
2023-07-19 20:28:46 +02:00
committed by GitHub
18 changed files with 50 additions and 38 deletions

View File

@@ -1,7 +1,7 @@
plugins {
id 'com.android.application'
id 'kotlin-android'
id 'org.jmailen.kotlinter' version '3.13.0'
id 'org.jmailen.kotlinter' version '3.15.0'
}
android {
@@ -33,18 +33,20 @@ android {
viewBinding true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '11'
}
lintOptions {
disable 'GoogleAppIndexingWarning'
lintConfig file('../lint.xml')
jvmTarget = '17'
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
resources {
excludes += ['META-INF/DEPENDENCIES']
}
}
lint {
disable 'GoogleAppIndexingWarning'
lintConfig file('../lint.xml')
}
}
@@ -64,13 +66,13 @@ if (project.hasProperty('sign')) {
dependencies {
implementation project(':client')
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.core:core-splashscreen:1.0.0'
implementation 'com.google.android.material:material:1.7.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-splashscreen:1.0.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.preference:preference:1.2.0'
implementation 'androidx.preference:preference-ktx:1.2.0'
implementation 'com.github.cyb3rko:QuickPermissions-Kotlin:1.0.2'
implementation 'com.hypertrack:hyperlog:0.0.10'