New release

CHANGELOG.md

@@ -1,5 +1,26 @@
 # 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
+- Upgrade library dependencies
+
+## 3.6.0.0 (versionCode 35, 2023-01-01)
+
+- Update to moasdawiki-server 3.6.0
+- Upgrade library dependencies
+- Update copyright year
+
+## 3.5.1.0 (versionCode 34, 2022-11-12)
+
+- Update to moasdawiki-server 3.5.1
+- Upgrade library dependencies
+
 ## 3.5.0.1 (versionCode 33, 2022-10-15)
 
 - Add app icon to fastlane folder

app/build.gradle

@@ -2,33 +2,33 @@ 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
+        minSdk 28 // 28 = Android 9
-        targetSdkVersion 33 // should be same as compileSdkVersion
+        targetSdk 33 // should be same as compileSdk
-        versionCode 33
+        versionCode 37
-        versionName "3.5.0.1"
+        versionName "3.6.2.0"
-        archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
-    lint {
+    buildFeatures {
-        // Workaround for KotlinNullPointerException in :app:lintVitalAnalyzeRelease
+        buildConfig true
-        checkReleaseBuilds false
+    }
+    base {
+        archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
     }
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:3.5.0'
+    api 'net.moasdawiki:moasdawiki-server:3.6.2'
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    api ('androidx.appcompat:appcompat:1.6.1') {
-    // androidx.appcompat:appcompat:1.5.0 causes dependency conflict, waiting for 1.5.1
+        exclude group: 'org.jetbrains', module: 'annotations'
-    // https://stackoverflow.com/questions/73406969/duplicate-class-androidx-lifecycle-viewmodellazy-found-in-modules-lifecycle-view
+    }
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    api ('androidx.preference:preference:1.2.1') {
-    // androidx.preference 1.2.0 causes dependency conflict
+        exclude group: 'org.jetbrains', module: 'annotations'
-    implementation 'androidx.preference:preference:1.1.1'
+    }
-    compileOnly 'org.jetbrains:annotations:23.0.0'
+    compileOnly 'org.jetbrains:annotations:24.0.1'
-    testImplementation 'org.testng:testng:7.6.1'
 }

app/src/main/java/net/moasdawiki/app/AndroidSettings.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarAccountAuthenticator.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarAccountAuthenticatorService.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarContentProvider.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarSyncAdapter.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/CalendarSyncAdapterService.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/Constants.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/MainActivity.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/SettingsActivity.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/SettingsFragment.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/SynchronizeWikiClient.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

app/src/main/java/net/moasdawiki/app/WikiEngineApplication.java

@@ -1,6 +1,6 @@
 /*
  * MoasdaWiki App
- * Copyright (C) 2008 - 2022 Herbert Reiter (herbert@moasdawiki.net)
+ * Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3 as published

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.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/34.txt

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

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

@@ -0,0 +1,3 @@
+- Auf moasdawiki-server 3.6.0 aktualisieren
+- Bibliotheks-Abhängigkeiten aktualisieren
+- Copyright-Jahr aktualisieren

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

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

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/34.txt

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

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

@@ -0,0 +1,3 @@
+- Update to moasdawiki-server 3.6.0
+- Upgrade library dependencies
+- Update copyright year

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

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

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

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

gradle.properties

@@ -17,6 +17,5 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx3100M

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-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

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 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"'
@@ -143,12 +143,16 @@ fi
 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 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal