Commit 8f201fbf authored by Ricki Hirner's avatar Ricki Hirner

Update Kotlin, gradle, gradle plugin

parent 94feded0
buildscript {
ext.kotlin_version = '1.3.21'
ext.dokka_version = '0.9.17'
ext.versions = [
kotlin: '1.3.30',
dokka: '0.9.17',
ical4j: '2.2.3'
]
repositories {
jcenter()
......@@ -9,9 +12,9 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"
classpath 'com.android.tools.build:gradle:3.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${versions.dokka}"
}
}
......@@ -24,10 +27,6 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'org.jetbrains.dokka-android'
ext {
ical4j_version = '2.2.3'
}
android {
compileSdkVersion 28
buildToolsVersion '28.0.3'
......@@ -38,7 +37,7 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
buildConfigField "String", "version_ical4j", "\"$ical4j_version\""
buildConfigField "String", "version_ical4j", "\"${versions.ical4j}\""
}
lintOptions {
disable 'AllowBackup'
......@@ -55,9 +54,9 @@ android {
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
api "org.mnode.ical4j:ical4j:$ical4j_version"
api "org.mnode.ical4j:ical4j:${versions.ical4j}"
implementation 'org.slf4j:slf4j-jdk14:1.7.25'
implementation 'androidx.core:core-ktx:1.0.1'
......
#Tue Aug 23 16:42:17 CEST 2016
#Wed Apr 17 22:31:47 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
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