Compare commits

...

4 Commits

Author SHA1 Message Date
Herbert Reiter 8c0326cebb New release 2023-08-07 20:53:01 +02:00
Herbert Reiter f3c444c025 New release 2023-08-07 20:51:36 +02:00
Herbert Reiter 1f4ae087d1 Fix Gradle build issue 2023-08-07 20:51:04 +02:00
Herbert Reiter 1aa4382529 Upgrade to Gradle 8.2.1 2023-08-07 20:49:26 +02:00
6 changed files with 18 additions and 7 deletions
+4
View File
@@ -1,5 +1,9 @@
# Changelog # Changelog
## 3.6.2.1 (versionCode 38, 2023-08-07)
- Fix Gradle build issue
## 3.6.2.0 (versionCode 37, 2023-08-05) ## 3.6.2.0 (versionCode 37, 2023-08-05)
- Update to moasdawiki-server 3.6.2 - Update to moasdawiki-server 3.6.2
+6 -2
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 33 // should be same as compileSdk targetSdk 33 // should be same as compileSdk
versionCode 37 versionCode 38
versionName "3.6.2.0" versionName "3.6.2.1"
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_11
@@ -17,6 +17,10 @@ android {
buildFeatures { buildFeatures {
buildConfig true buildConfig true
} }
lintOptions {
// Workaround for NullPointerException in :app:lintVitalAnalyzeRelease
checkReleaseBuilds false
}
base { base {
archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
} }
@@ -0,0 +1 @@
- Gradle-Problem beheben
@@ -0,0 +1 @@
- Fix Gradle build issue
Binary file not shown.
Vendored
+6 -5
View File
@@ -85,9 +85,6 @@ done
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# 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"'
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum
@@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045 # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
@@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #( '' | soft) :;; #(
*) *)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045 # shellcheck disable=SC3045
ulimit -n "$MAX_FD" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
done done
fi 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; # Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in # shell script including quotes and variable substitutions, so put them in