From a966db6b813e2a2d6cb4839fc3e415707bd2428f Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Mon, 8 Nov 2021 09:27:25 +0100
Subject: Update dependencies

---
 .github/workflows/test-dev.yml                                   | 8 +++-----
 build.gradle                                                     | 9 +++++----
 .../java/at/bitfire/cert4android/TrustCertificateActivity.kt     | 2 +-
 src/test/java/at/bitfire/cert4android/CertUtilsTest.kt           | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml
index 4a3b070..3b8ceb1 100644
--- a/.github/workflows/test-dev.yml
+++ b/.github/workflows/test-dev.yml
@@ -15,10 +15,8 @@ jobs:
           cache: 'gradle'
       - uses: gradle/wrapper-validation-action@v1
 
-      - name: Run lint
-        run: ./gradlew lintDebug
-      - name: Run unit tests
-        run: ./gradlew testDebugUnitTest
+      - name: Check
+        run: ./gradlew check
       - name: Archive results
         uses: actions/upload-artifact@v2
         with:
@@ -53,7 +51,7 @@ jobs:
       - name: Start emulator
         run: start-emulator.sh
       - name: Run connected tests
-        run: ./gradlew connectedDebugAndroidTest
+        run: ./gradlew connectedCheck
       - name: Archive results
         uses: actions/upload-artifact@v2
         with:
diff --git a/build.gradle b/build.gradle
index 4f75e15..3f6545c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 
 buildscript {
     ext.versions = [
-        kotlin: '1.5.21',
+        kotlin: '1.5.31',
         dokka: '1.5.0',
         conscrypt: '2.5.2'
     ]
@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
     }
@@ -25,6 +25,7 @@ repositories {
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'org.jetbrains.dokka'
 
 android {
@@ -67,8 +68,8 @@ dependencies {
     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 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
     implementation 'com.google.android.material:material:1.4.0'
     implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}"
 
diff --git a/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt b/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt
index a50c0ee..16eff3c 100644
--- a/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt
+++ b/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt
@@ -37,7 +37,7 @@ class TrustCertificateActivity: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        model = ViewModelProvider(this).get(Model::class.java)
+        model = ViewModelProvider(this)[Model::class.java]
         model.processIntent(intent)
 
         val binding = DataBindingUtil.setContentView<ActivityTrustCertificateBinding>(this, R.layout.activity_trust_certificate)
diff --git a/src/test/java/at/bitfire/cert4android/CertUtilsTest.kt b/src/test/java/at/bitfire/cert4android/CertUtilsTest.kt
index cd33b18..eb22772 100644
--- a/src/test/java/at/bitfire/cert4android/CertUtilsTest.kt
+++ b/src/test/java/at/bitfire/cert4android/CertUtilsTest.kt
@@ -17,7 +17,7 @@ import java.security.spec.MGF1ParameterSpec
 
 class CertUtilsTest {
 
-    val certFactory = CertificateFactory.getInstance("X.509")
+    private val certFactory = CertificateFactory.getInstance("X.509")!!
 
 
     @Test
-- 
cgit v1.2.3