Update gradle (#785)

Co-authored-by: Gitsaibot <Gitsaibot@exmaple.com>
This commit is contained in:
Gitsaibot 2020-10-04 02:40:42 +02:00 committed by GitHub
parent 8384d869e3
commit 6e4a6677a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions

View File

@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.3.72'
ext.kotlin_version = '1.4.10'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.3'
classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
@ -22,12 +22,12 @@ project(':external:calendar') {
apply plugin: 'com.android.library'
android {
compileSdkVersion 29
compileSdkVersion 30
buildToolsVersion '29.0.2'
defaultConfig {
minSdkVersion 19
targetSdkVersion 29
targetSdkVersion 30
}
sourceSets {
@ -53,12 +53,12 @@ project(':external:colorpicker') {
apply plugin: 'com.android.library'
android {
compileSdkVersion 29
compileSdkVersion 30
buildToolsVersion '29.0.2'
defaultConfig {
minSdkVersion 19
targetSdkVersion 29
targetSdkVersion 30
}
sourceSets {
@ -87,12 +87,12 @@ project(':external:timezonepicker') {
}
android {
compileSdkVersion 29
compileSdkVersion 30
buildToolsVersion '29.0.2'
defaultConfig {
minSdkVersion 19
targetSdkVersion 29
targetSdkVersion 30
}
sourceSets {
@ -116,12 +116,12 @@ project(':external:chips') {
apply plugin: 'com.android.library'
android {
compileSdkVersion 29
compileSdkVersion 30
buildToolsVersion '29.0.2'
defaultConfig {
minSdkVersion 19
targetSdkVersion 29
targetSdkVersion 30
}
sourceSets {
@ -148,13 +148,13 @@ apply plugin: 'kotlin-android'
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1"
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
implementation 'com.google.android.material:material:1.2.1'
implementation project(':external:calendar')
implementation project(':external:colorpicker')
@ -163,12 +163,12 @@ dependencies {
}
android {
compileSdkVersion 29
compileSdkVersion 30
buildToolsVersion '29.0.2'
defaultConfig {
minSdkVersion 19
targetSdkVersion 29
targetSdkVersion 30
versionCode 25
versionName "1.0.23"
applicationId "ws.xsoh.etar"

View File

@ -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-6.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip