Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9a967c58eb | |||
| d0afd9bd8a | |||
| 3fd1567ccf | |||
| 7d14124bde | |||
| 84bef6b9c1 | |||
| 976317437e | |||
| f529528145 | |||
| cb9b235b30 | |||
| 0c183df154 | |||
| 7dff72bd0f | |||
| 0011124c76 | |||
| e08ba7e27c | |||
| ae6de92387 | |||
| 0bec9f2848 | |||
| cc8116c10b | |||
| 7d18b4bd59 |
@@ -1,5 +1,25 @@
|
||||
# Changelog
|
||||
|
||||
## 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
|
||||
|
||||
## 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
|
||||
|
||||
+7
-6
@@ -1,13 +1,14 @@
|
||||
apply plugin: 'com.android.application'
|
||||
|
||||
android {
|
||||
namespace "net.moasdawiki.app"
|
||||
compileSdkVersion 33 // 33 = Android 13
|
||||
defaultConfig {
|
||||
applicationId "net.moasdawiki.app"
|
||||
minSdkVersion 28 // 28 = Android 9
|
||||
targetSdkVersion 33 // should be same as compileSdkVersion
|
||||
versionCode 30
|
||||
versionName "3.4.5.0"
|
||||
versionCode 35
|
||||
versionName "3.6.0.0"
|
||||
archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
|
||||
}
|
||||
compileOptions {
|
||||
@@ -21,13 +22,13 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'net.moasdawiki:moasdawiki-server:3.4.5'
|
||||
implementation 'net.moasdawiki:moasdawiki-server:3.6.0'
|
||||
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.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'
|
||||
compileOnly 'org.jetbrains:annotations:23.0.0'
|
||||
testImplementation 'org.testng:testng:7.6.1'
|
||||
compileOnly 'org.jetbrains:annotations:23.1.0'
|
||||
testImplementation 'org.testng:testng:7.7.1'
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
package="net.moasdawiki.app">
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ buildscript {
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.2.2'
|
||||
classpath 'com.android.tools.build:gradle:7.3.1'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// 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 @@
|
||||
- App-Symbol im fastlane-Ordner hinzufügen
|
||||
@@ -0,0 +1,2 @@
|
||||
- Auf moasdawiki-server 3.5.1 aktualisieren
|
||||
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||
@@ -0,0 +1,3 @@
|
||||
- Auf moasdawiki-server 3.6.0 aktualisieren
|
||||
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||
- Copyright-Jahr aktualisieren
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
@@ -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
|
||||
@@ -0,0 +1,3 @@
|
||||
- Update to moasdawiki-server 3.6.0
|
||||
- Upgrade library dependencies
|
||||
- Update copyright year
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 31 KiB |
Vendored
BIN
Binary file not shown.
+1
-1
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
Reference in New Issue
Block a user