New release

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.5.0.0 (versionCode 32, 2022-10-08)
+ 
+- Update to moasdawiki-server 3.5.0
+- Upgrade library dependencies
+
+## 3.4.5.0 (versionCode 31, 2022-09-05)
+
+- Update to moasdawiki-server 3.4.5
+- Upgrade library dependencies
+
 ## 3.4.4.0 (versionCode 30, 2022-04-14)
 
 - Update to moasdawiki-server 3.4.4

app/build.gradle

@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31 // 31 = Android 12
+    namespace "net.moasdawiki.app"
+    compileSdkVersion 33 // 33 = Android 13
     defaultConfig {
         applicationId "net.moasdawiki.app"
         minSdkVersion 28 // 28 = Android 9
-        targetSdkVersion 31 // should be same as compileSdkVersion
+        targetSdkVersion 33 // should be same as compileSdkVersion
-        versionCode 30
+        versionCode 32
-        versionName "3.4.4.0"
+        versionName "3.5.0.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     compileOptions {
@@ -21,11 +22,13 @@ android {
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:3.4.4'
+    implementation 'net.moasdawiki:moasdawiki-server:3.5.0'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    // androidx.appcompat:appcompat:1.5.0 causes dependency conflict, waiting for 1.5.1
+    // 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'
     compileOnly 'org.jetbrains:annotations:23.0.0'
-    testImplementation 'org.testng:testng:7.5'
+    testImplementation 'org.testng:testng:7.6.1'
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="net.moasdawiki.app">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>

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

@@ -430,7 +430,7 @@ public class SynchronizeWikiClient {
      */
     @NotNull
     private String generateXml(@NotNull AbstractSyncXml xmlBean) throws ServiceException {
-        XmlGenerator xmlGenerator = new XmlGenerator(logger);
+        XmlGenerator xmlGenerator = new XmlGenerator();
         return xmlGenerator.generate(xmlBean);
     }
 

build.gradle

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

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

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

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

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

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

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

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

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