Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f529528145 | |||
| cb9b235b30 | |||
| 0c183df154 | |||
| 7dff72bd0f | |||
| 0011124c76 | |||
| e08ba7e27c | |||
| ae6de92387 | |||
| 0bec9f2848 | |||
| cc8116c10b | |||
| 7d18b4bd59 | |||
| 46be7f77e5 | |||
| 8db8e05f4d | |||
| 40a1662797 | |||
| 60e54ae92a |
@@ -1,5 +1,24 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 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
|
||||||
|
|
||||||
|
## 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)
|
## 3.4.4.0 (versionCode 30, 2022-04-14)
|
||||||
|
|
||||||
- Update to moasdawiki-server 3.4.4
|
- Update to moasdawiki-server 3.4.4
|
||||||
|
|||||||
+10
-7
@@ -1,13 +1,14 @@
|
|||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 31 // 31 = Android 12
|
namespace "net.moasdawiki.app"
|
||||||
|
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 31 // should be same as compileSdkVersion
|
targetSdkVersion 33 // should be same as compileSdkVersion
|
||||||
versionCode 30
|
versionCode 34
|
||||||
versionName "3.4.4.0"
|
versionName "3.5.1.0"
|
||||||
archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
|
archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
@@ -21,11 +22,13 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'net.moasdawiki:moasdawiki-server:3.4.4'
|
implementation 'net.moasdawiki:moasdawiki-server:3.5.1'
|
||||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
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
|
// androidx.preference 1.2.0 causes dependency conflict
|
||||||
implementation 'androidx.preference:preference:1.1.1'
|
implementation 'androidx.preference:preference:1.1.1'
|
||||||
compileOnly 'org.jetbrains:annotations:23.0.0'
|
compileOnly 'org.jetbrains:annotations:23.0.0'
|
||||||
testImplementation 'org.testng:testng:7.5'
|
testImplementation 'org.testng:testng:7.6.1'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
@@ -6,7 +6,7 @@ buildscript {
|
|||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.1.3'
|
classpath 'com.android.tools.build:gradle:7.3.1'
|
||||||
|
|
||||||
// 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.4.5 aktualisieren
|
||||||
|
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
- Auf moasdawiki-server 3.5.0 aktualisieren
|
||||||
|
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
- App-Symbol im fastlane-Ordner hinzufügen
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
- Auf moasdawiki-server 3.5.1 aktualisieren
|
||||||
|
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
@@ -0,0 +1,2 @@
|
|||||||
|
- Update to moasdawiki-server 3.4.5
|
||||||
|
- Upgrade library dependencies
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
- Update to moasdawiki-server 3.5.0
|
||||||
|
- Upgrade library dependencies
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
- Add app icon to fastlane folder
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
- Update to moasdawiki-server 3.5.1
|
||||||
|
- Upgrade library dependencies
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
Reference in New Issue
Block a user