Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/bitfireAT/cert4android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicki Hirner <hirner@bitfire.at>2022-10-29 16:46:23 +0300
committerRicki Hirner <hirner@bitfire.at>2022-10-29 16:47:10 +0300
commit2c41f865731c02c41e540fe735b43b371cc65926 (patch)
tree5d44789491502304fb6f67faf06c1e555c8719cd
parent2b73cbff101298723b7f89dfbec4bd5b6f423738 (diff)
Update dependenciesHEADmain
-rw-r--r--README.md5
-rw-r--r--build.gradle17
2 files changed, 7 insertions, 15 deletions
diff --git a/README.md b/README.md
index f696252..c0a384e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
-[![Development tests](https://github.com/bitfireAT/cert4android/actions/workflows/test-dev.yml/badge.svg)](https://github.com/bitfireAT/cert4android/actions/workflows/test-dev.yml)
-[![Documentation](https://img.shields.io/badge/documentation-kdoc-brightgreen)](https://bitfireat.github.io/cert4android/)
+[![License](https://img.shields.io/github/license/bitfireAT/cert4android)](https://github.com/bitfireAT/cert4android/blob/main/LICENSE)
+[![Tests](https://github.com/bitfireAT/cert4android/actions/workflows/test-dev.yml/badge.svg)](https://github.com/bitfireAT/cert4android/actions/workflows/test-dev.yml)
+[![KDoc](https://img.shields.io/badge/documentation-KDoc-informational)](https://bitfireat.github.io/cert4android/)
# cert4android
diff --git a/build.gradle b/build.gradle
index c38e842..38798e7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
buildscript {
ext.versions = [
- kotlin: '1.7.10',
- dokka: '1.5.0',
+ kotlin: '1.7.20',
+ dokka: '1.7.20',
conscrypt: '2.5.2'
]
@@ -11,7 +11,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.3.0'
+ classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
}
@@ -52,15 +52,6 @@ android {
defaultConfig {
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/"
- lineSuffix = "#L"
- }
- jdkVersion = 7
- }*/
}
dependencies {
@@ -71,7 +62,7 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
- implementation 'com.google.android.material:material:1.6.1'
+ implementation 'com.google.android.material:material:1.7.0'
implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}"
androidTestImplementation 'androidx.test:runner:1.4.0'