From 09a2fb28f79fe24dad5f75a9ce94c8a67791cdcd Mon Sep 17 00:00:00 2001
From: Herbert Reiter <4941275-moasda@users.noreply.gitlab.com>
Date: Sun, 27 Dec 2020 16:30:08 +0100
Subject: [PATCH] Upgrade library dependencies

---
 app/build.gradle                         | 16 +++++++++-------
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index aaada80..55ef14f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29 // 29 = Android 10
+    compileSdkVersion 30 // 30 = Android 11
     defaultConfig {
         applicationId "net.moasdawiki.app"
         minSdkVersion 26 // 26 = Oreo 8.0
-        targetSdkVersion 29 // should be same as compileSdkVersion
-        versionCode 19
-        versionName "2.3.3.0"
+        targetSdkVersion 30 // should be same as compileSdkVersion
+        versionCode 20
+        versionName "2.4.0.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
@@ -24,10 +24,12 @@ android {
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.3.3'
+    // HR: Workaround für Android Studio Bug
+    implementation files('/daten/wissensdb/moasdawiki-server-2.4.1.jar')
+    //implementation 'net.moasdawiki:moasdawiki-server:2.4.1'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.preference:preference:1.1.1'
-    compileOnly 'org.jetbrains:annotations:19.0.0'
-    testImplementation 'org.testng:testng:6.14.3'
+    compileOnly 'org.jetbrains:annotations:20.1.0'
+    testImplementation 'org.testng:testng:7.3.0'
 }
diff --git a/build.gradle b/build.gradle
index 52aa141..3288791 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d4412b8..1fa1ecb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 08 22:17:23 CEST 2020
+#Sun Dec 27 12:01:31 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip