diff options
| author | Ricki Hirner <hirner@bitfire.at> | 2021-08-22 17:43:52 +0300 |
|---|---|---|
| committer | Ricki Hirner <hirner@bitfire.at> | 2021-08-22 19:23:33 +0300 |
| commit | df0f42539ee3119b001e50b914c6a83fb65d2747 (patch) | |
| tree | 4b17d8a20cdcb9f537de7d4828def0490a1eb04a | |
| parent | 66f9bc1c51f813a229372d8b05760d42ebaddab1 (diff) | |
Update dependencies
| -rw-r--r-- | build.gradle | 15 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/build.gradle b/build.gradle index 0e52f97..f0244d4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ buildscript { ext.versions = [ - kotlin: '1.4.32', - dokka: '0.10.1', + kotlin: '1.5.21', + dokka: '1.5.0', conscrypt: '2.5.2' ] @@ -12,7 +12,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}" } @@ -51,6 +51,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + // TODO currently doesn't work with dokka 1.5.0, but dokka 0.10.1 doesn't work with new gradle dokka.configuration { sourceLink { url = "https://gitlab.com/bitfireAT/cert4android/tree/master/" @@ -63,16 +64,16 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}" - implementation 'androidx.appcompat:appcompat:1.3.0' + implementation 'androidx.appcompat:appcompat:1.3.1' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' - implementation 'com.google.android.material:material:1.3.0' + implementation 'com.google.android.material:material:1.4.0' implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}" - androidTestImplementation 'androidx.test:runner:1.3.0' - androidTestImplementation 'androidx.test:rules:1.3.0' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test:rules:1.4.0' androidTestImplementation 'com.squareup.okhttp3:mockwebserver:4.9.1' testImplementation 'junit:junit:4.13.2' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3769436..42bbb3f 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.7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip |