Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 67e30728f0 | |||
| 75a186f37c | |||
| 74c539c1de | |||
| 7a9626e860 | |||
| 63d4dc289e | |||
| 742770826e | |||
| 9887622c75 | |||
| c159f7b654 |
@@ -1,5 +1,19 @@
|
||||
# Changelog
|
||||
|
||||
## 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
|
||||
|
||||
+4
-4
@@ -7,8 +7,8 @@ android {
|
||||
applicationId "net.moasdawiki.app"
|
||||
minSdk 28 // 28 = Android 9
|
||||
targetSdk 34 // should be same as compileSdk
|
||||
versionCode 40
|
||||
versionName "3.6.3.1"
|
||||
versionCode 43
|
||||
versionName "3.7.1.1"
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_11
|
||||
@@ -27,12 +27,12 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api 'net.moasdawiki:moasdawiki-server:3.6.3'
|
||||
api 'net.moasdawiki:moasdawiki-server:3.7.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:24.1.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
@@ -6,7 +6,7 @@ buildscript {
|
||||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.1.3'
|
||||
classpath 'com.android.tools.build:gradle:8.4.0'
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
||||
@@ -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 @@
|
||||
- Update to moasdawiki-server 3.7.1
|
||||
- Upgrade to Gradle 8.5
|
||||
- Update copyright year
|
||||
@@ -0,0 +1 @@
|
||||
- Upgrade to Gradle 8.7
|
||||
Vendored
BIN
Binary file not shown.
+2
-2
@@ -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=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
||||
@@ -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" \
|
||||
|
||||
Reference in New Issue
Block a user