Compare commits

..

4 Commits

Author SHA1 Message Date
Herbert Reiter 9f2c84d673 New release 2024-10-04 10:00:30 +02:00
Herbert Reiter 0ba9bfda35 Update to moasdawiki-server 3.9.1 2024-10-04 09:58:04 +02:00
Herbert Reiter dcbfc23070 Upgrade library dependencies 2024-10-04 09:56:45 +02:00
Herbert Reiter 42d01a9abe Upgrade to Gradle 8.10.2 2024-10-04 09:33:30 +02:00
9 changed files with 115 additions and 99 deletions
+4
View File
@@ -0,0 +1,4 @@
*.sh text eol=lf
# Files with CRLF line endings
gradlew.bat text eol=crlf
+6
View File
@@ -1,5 +1,11 @@
# Changelog # Changelog
## 3.9.1.0 (versionCode 44, 2024-10-04)
- Update to moasdawiki-server 3.9.1
- Upgrade to Gradle 8.10.2
- Upgrade library dependencies
## 3.7.1.1 (versionCode 43, 2024-05-10) ## 3.7.1.1 (versionCode 43, 2024-05-10)
- Upgrade to Gradle 8.7 - Upgrade to Gradle 8.7
+4 -4
View File
@@ -7,8 +7,8 @@ android {
applicationId "net.moasdawiki.app" applicationId "net.moasdawiki.app"
minSdk 28 // 28 = Android 9 minSdk 28 // 28 = Android 9
targetSdk 34 // should be same as compileSdk targetSdk 34 // should be same as compileSdk
versionCode 43 versionCode 44
versionName "3.7.1.1" versionName "3.9.1.0"
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_11
@@ -27,12 +27,12 @@ android {
} }
dependencies { dependencies {
api 'net.moasdawiki:moasdawiki-server:3.7.1' api 'net.moasdawiki:moasdawiki-server:3.9.1'
api ('androidx.appcompat:appcompat:1.6.1') { api ('androidx.appcompat:appcompat:1.6.1') {
exclude group: 'org.jetbrains', module: 'annotations' exclude group: 'org.jetbrains', module: 'annotations'
} }
api ('androidx.preference:preference:1.2.1') { api ('androidx.preference:preference:1.2.1') {
exclude group: 'org.jetbrains', module: 'annotations' exclude group: 'org.jetbrains', module: 'annotations'
} }
compileOnly 'org.jetbrains:annotations:24.1.0' compileOnly 'org.jetbrains:annotations:25.0.0'
} }
+1 -1
View File
@@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.4.0' classpath 'com.android.tools.build:gradle:8.6.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,3 @@
- Auf moasdawiki-server 3.9.1 aktualisieren
- Gradle-Upgrade auf 8.10.2
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,3 @@
- Update to moasdawiki-server 3.9.1
- Upgrade to Gradle 8.10.2
- Upgrade library dependencies
Binary file not shown.
+2 -2
View File
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
Vendored
+10 -10
View File
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail