Commit 713d3f25 authored by Ricki Hirner's avatar Ricki Hirner

Update gradle & dependencies

parent 68878468
Pipeline #76210138 passed with stage
in 3 minutes and 9 seconds
......@@ -13,12 +13,13 @@ apply plugin: 'kotlin-kapt'
android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
buildToolsVersion '29.0.1'
defaultConfig {
applicationId "at.bitfire.icsdroid"
minSdkVersion 19
targetSdkVersion 28
multiDexEnabled true // >64k methods for Android 4.4
versionCode 38
versionName "1.8.4"
......@@ -32,8 +33,14 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
buildTypes {
debug {
minifyEnabled false
}
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
......@@ -64,6 +71,7 @@ android {
}
dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}"
implementation project(':cert4android')
......@@ -71,10 +79,10 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.lifecycle:lifecycle-livedata:2.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
implementation 'androidx.work:work-runtime-ktx:2.0.1'
implementation 'androidx.work:work-runtime-ktx:2.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'com.jaredrummler:colorpicker:1.1.0'
......
......@@ -17,7 +17,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.1'
classpath 'com.android.tools.build:gradle:3.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
}
}
......
Subproject commit 1ead10b7ad8e5c7399e68cd03bba25d212f2ef55
Subproject commit 8ad6a3db2fcd1e1ee6cf8e116fc5f69d904ad108
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx4g
# use AndroidX
android.useAndroidX=true
......@@ -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-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
Subproject commit c6e4f19ee284e0636a8fbac08523b3937441971a
Subproject commit a59848577e065ed92890d94f1ff24c764ebbb5e4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment