New release

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.6.2.0 (versionCode 37, 2023-08-05)
+
+- Update to moasdawiki-server 3.6.2
+- Upgrade library dependencies
+
 ## 3.6.1.0 (versionCode 36, 2023-04-29)
 
 - Update to moasdawiki-server 3.6.1

app/build.gradle

@@ -2,14 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     namespace "net.moasdawiki.app"
-    compileSdkVersion 33 // 33 = Android 13
+    compileSdk 33 // 33 = Android 13
     defaultConfig {
         applicationId "net.moasdawiki.app"
-        minSdkVersion 28 // 28 = Android 9
-        targetSdkVersion 33 // should be same as compileSdkVersion
-        versionCode 36
-        versionName "3.6.1.0"
-        archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
+        minSdk 28 // 28 = Android 9
+        targetSdk 33 // should be same as compileSdk
+        versionCode 37
+        versionName "3.6.2.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -18,20 +17,18 @@ android {
     buildFeatures {
         buildConfig true
     }
-    lint {
-        // Workaround for KotlinNullPointerException in :app:lintVitalAnalyzeRelease
-        checkReleaseBuilds false
+    base {
+        archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
     }
 }
 
 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 'net.moasdawiki:moasdawiki-server:3.6.2'
+    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'
 }

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0'
+        classpath 'com.android.tools.build:gradle:8.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fastlane/metadata/android/de/changelogs/37.txt

@@ -0,0 +1,2 @@
+- Auf moasdawiki-server 3.6.2 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren

fastlane/metadata/android/en-US/changelogs/37.txt

@@ -0,0 +1,2 @@
+- Update to moasdawiki-server 3.6.2
+- Upgrade library dependencies

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,6 +85,9 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -141,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -194,10 +197,6 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in