Compare commits

...

14 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
Herbert Reiter 67e30728f0 New release 2024-05-10 23:08:45 +02:00
Herbert Reiter 75a186f37c Upgrade to Gradle 8.7 2024-05-10 22:26:04 +02:00
Herbert Reiter 74c539c1de New release 2024-01-01 12:35:31 +01:00
Herbert Reiter 7a9626e860 Update copyright year 2024-01-01 12:05:11 +01:00
Herbert Reiter 63d4dc289e Upgrade to Gradle 8.5 2024-01-01 12:03:22 +01:00
Herbert Reiter 742770826e Update to moasdawiki-server 3.7.1 2024-01-01 12:02:36 +01:00
Herbert Reiter 9887622c75 Upgrade library dependencies 2023-12-12 20:18:38 +01:00
Herbert Reiter c159f7b654 Upgrade library dependencies 2023-12-12 20:15:09 +01:00
Herbert Reiter a5b1d6ab98 New release 2023-11-15 21:16:06 +01:00
Herbert Reiter 0761586405 Fix Gradle build issue in fdroid build 2023-11-15 21:13:49 +01:00
28 changed files with 168 additions and 119 deletions
+4
View File
@@ -0,0 +1,4 @@
*.sh text eol=lf
# Files with CRLF line endings
gradlew.bat text eol=crlf
+24
View File
@@ -1,5 +1,29 @@
# 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)
- Upgrade to Gradle 8.7
## 3.7.1.0 (versionCode 42, 2024-01-01)
- Update to moasdawiki-server 3.7.1
- Upgrade to Gradle 8.5
- Update copyright year
## 3.6.3.2 (versionCode 41, 2023-12-12)
- Upgrade library dependencies
## 3.6.3.1 (versionCode 40, 2023-11-15)
- Fix Gradle build issue in fdroid build
## 3.6.3.0 (versionCode 39, 2023-11-11)
- Limit calendar import to 100 events as Android has a global limit of 500 events
+8 -4
View File
@@ -7,8 +7,8 @@ android {
applicationId "net.moasdawiki.app"
minSdk 28 // 28 = Android 9
targetSdk 34 // should be same as compileSdk
versionCode 39
versionName "3.6.3.0"
versionCode 44
versionName "3.9.1.0"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
@@ -17,18 +17,22 @@ android {
buildFeatures {
buildConfig true
}
lintOptions {
// Workaround for NullPointerException in :app:lintVitalAnalyzeRelease in fdroid build
checkReleaseBuilds false
}
base {
archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
}
}
dependencies {
api 'net.moasdawiki:moasdawiki-server:3.6.3'
api 'net.moasdawiki:moasdawiki-server:3.9.1'
api ('androidx.appcompat:appcompat:1.6.1') {
exclude group: 'org.jetbrains', module: 'annotations'
}
api ('androidx.preference:preference:1.2.1') {
exclude group: 'org.jetbrains', module: 'annotations'
}
compileOnly 'org.jetbrains:annotations:24.0.1'
compileOnly 'org.jetbrains:annotations:25.0.0'
}
@@ -1,6 +1,6 @@
/*
* MoasdaWiki App
* Copyright (C) 2008 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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 - 2023 Herbert Reiter (herbert@moasdawiki.net)
* Copyright (C) 2008 - 2024 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
View File
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.3'
classpath 'com.android.tools.build:gradle:8.6.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -0,0 +1 @@
- Gradle-Problem bei fdroid beheben
@@ -0,0 +1,3 @@
- Auf moasdawiki-server 3.7.1 aktualisieren
- Gradle-Upgrade auf 8.5
- Copyright-Jahr aktualisieren
@@ -0,0 +1 @@
- Upgrade to Gradle 8.7
@@ -0,0 +1,3 @@
- Auf moasdawiki-server 3.9.1 aktualisieren
- Gradle-Upgrade auf 8.10.2
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1 @@
- Fix Gradle build issue in fdroid build
@@ -0,0 +1,3 @@
- Update to moasdawiki-server 3.7.1
- Upgrade to Gradle 8.5
- Update copyright year
@@ -0,0 +1 @@
- Upgrade to Gradle 8.7
@@ -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
distributionPath=wrapper/dists
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Vendored
+9 -8
View File
@@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -201,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Vendored
+10 -10
View File
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2
goto fail