diff options
| author | Ricki Hirner <hirner@bitfire.at> | 2020-10-15 18:49:10 +0300 |
|---|---|---|
| committer | Ricki Hirner <hirner@bitfire.at> | 2020-10-15 18:49:10 +0300 |
| commit | 047e48f9b5dddbc726d36b3677c01d223b6ad2dd (patch) | |
| tree | 905cbd46456e96fd5c78f6d4e92e1bd6f33e5e40 | |
| parent | 72cf235ad9ba20acca61da3b9f5f7c5aa7457d5c (diff) | |
Update dependencies and gradle plugin; increase target SDK level to 30
| -rw-r--r-- | build.gradle | 10 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle index 4f6721a..dd473da 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext.versions = [ kotlin: '1.4.10', dokka: '0.10.1', - conscrypt: '2.4.0' + conscrypt: '2.5.0' ] repositories { @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:4.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" } @@ -28,12 +28,12 @@ apply plugin: 'kotlin-android' apply plugin: 'org.jetbrains.dokka' android { - compileSdkVersion 29 + compileSdkVersion 30 buildToolsVersion '30.0.2' defaultConfig { minSdkVersion 14 // Android 4.0 - targetSdkVersion 29 // Android 10 + targetSdkVersion 30 // Android 11 } compileOptions { @@ -66,7 +66,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0' + implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' implementation 'com.google.android.material:material:1.2.1' implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e2b225..d042ef0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip |