From 6c47546d8ecbf7fb02b2069e16e791a2edb9a332 Mon Sep 17 00:00:00 2001
From: Herbert Reiter <4941275-moasda@users.noreply.gitlab.com>
Date: Sat, 5 Aug 2023 22:04:17 +0200
Subject: [PATCH] Upgrade dependencies

---
 app/build.gradle | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8460992..b59f589 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,11 +25,11 @@ android {
 dependencies {
     implementation 'net.moasdawiki:moasdawiki-server:3.6.1'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    // androidx.appcompat:appcompat:1.5.0 causes dependency conflict, waiting for 1.6
-    // https://stackoverflow.com/questions/73406969/duplicate-class-androidx-lifecycle-viewmodellazy-found-in-modules-lifecycle-view
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    // androidx.preference 1.2.0 causes dependency conflict
-    implementation 'androidx.preference:preference:1.1.1'
+    api ('androidx.appcompat:appcompat:1.6.1') {
+        exclude group: 'org.jetbrains', module: 'annotations'
+    }
+    api ('androidx.preference:preference:1.2.1') {
+        exclude group: 'org.jetbrains', module: 'annotations'
+    }
     compileOnly 'org.jetbrains:annotations:24.0.1'
-    testImplementation 'org.testng:testng:7.7.1'
 }