Compare commits

..

4 Commits

Author SHA1 Message Date
Herbert Reiter ae6de92387 New release 2022-10-08 20:46:25 +02:00
Herbert Reiter 0bec9f2848 New release 2022-10-08 20:44:35 +02:00
Herbert Reiter cc8116c10b Upgrade library dependencies 2022-10-08 20:44:06 +02:00
Herbert Reiter 7d18b4bd59 Update to moasdawiki-server 3.5.0 2022-10-08 20:42:57 +02:00
7 changed files with 16 additions and 7 deletions
+5
View File
@@ -1,5 +1,10 @@
# Changelog # 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) ## 3.4.5.0 (versionCode 31, 2022-09-05)
- Update to moasdawiki-server 3.4.5 - Update to moasdawiki-server 3.4.5
+4 -3
View File
@@ -1,13 +1,14 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
namespace "net.moasdawiki.app"
compileSdkVersion 33 // 33 = Android 13 compileSdkVersion 33 // 33 = Android 13
defaultConfig { defaultConfig {
applicationId "net.moasdawiki.app" applicationId "net.moasdawiki.app"
minSdkVersion 28 // 28 = Android 9 minSdkVersion 28 // 28 = Android 9
targetSdkVersion 33 // should be same as compileSdkVersion targetSdkVersion 33 // should be same as compileSdkVersion
versionCode 30 versionCode 32
versionName "3.4.5.0" versionName "3.5.0.0"
archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
} }
compileOptions { compileOptions {
@@ -21,7 +22,7 @@ android {
} }
dependencies { dependencies {
implementation 'net.moasdawiki:moasdawiki-server:3.4.5' implementation 'net.moasdawiki:moasdawiki-server:3.5.0'
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
// androidx.appcompat:appcompat:1.5.0 causes dependency conflict, waiting for 1.5.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 // https://stackoverflow.com/questions/73406969/duplicate-class-androidx-lifecycle-viewmodellazy-found-in-modules-lifecycle-view
+1 -2
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <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.INTERNET" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
@@ -430,7 +430,7 @@ public class SynchronizeWikiClient {
*/ */
@NotNull @NotNull
private String generateXml(@NotNull AbstractSyncXml xmlBean) throws ServiceException { private String generateXml(@NotNull AbstractSyncXml xmlBean) throws ServiceException {
XmlGenerator xmlGenerator = new XmlGenerator(logger); XmlGenerator xmlGenerator = new XmlGenerator();
return xmlGenerator.generate(xmlBean); return xmlGenerator.generate(xmlBean);
} }
+1 -1
View File
@@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.2.2' classpath 'com.android.tools.build:gradle:7.3.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@@ -0,0 +1,2 @@
- Auf moasdawiki-server 3.5.0 aktualisieren
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,2 @@
- Update to moasdawiki-server 3.5.0
- Upgrade library dependencies