Compare commits

..

23 Commits

Author SHA1 Message Date
Herbert Reiter 009c1e5131 New release 2025-07-06 20:31:20 +02:00
Herbert Reiter 3839ad430c Upgrade library dependencies 2025-07-06 20:28:44 +02:00
Herbert Reiter 5b60b46676 Update Gradle 2025-07-06 20:28:18 +02:00
Herbert Reiter cfe89ec716 Fix warning 2025-07-06 20:28:01 +02:00
Herbert Reiter 766326d170 Update to moasdawiki-server 3.9.5 2025-07-06 20:11:20 +02:00
Herbert Reiter 9d281ebde9 Upgrade to Android API 36 (Android 16) 2025-07-06 20:10:27 +02:00
Herbert Reiter 8959fdaa99 Show Gradle warnings 2025-07-06 20:09:02 +02:00
Herbert Reiter fbed0a15dc Upgrade to Gradle 8.14.3 2025-07-06 20:08:01 +02:00
Herbert Reiter 562d3662da New release 2025-01-05 22:02:02 +01:00
Herbert Reiter c97656a5d0 Update to moasdawiki-server 3.9.3 2025-01-05 21:59:04 +01:00
Herbert Reiter 1b5f7918ce Upgrade library dependencies 2025-01-05 21:58:19 +01:00
Herbert Reiter 49e575e462 Update copyright year 2025-01-05 21:57:45 +01:00
Herbert Reiter ddc5cea6bd Upgrade to Gradle 8.12 2025-01-05 21:57:23 +01:00
Herbert Reiter 52ecbeb7d7 Add Google Play link 2024-11-02 18:39:45 +01:00
Herbert Reiter d021267fcd New release 2024-11-02 18:00:32 +01:00
Herbert Reiter 6cb3e218c4 Upgrade library dependencies 2024-11-02 17:57:58 +01:00
Herbert Reiter 7b3aa69732 New release 2024-11-02 17:37:09 +01:00
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
34 changed files with 217 additions and 163 deletions
+4
View File
@@ -0,0 +1,4 @@
*.sh text eol=lf
# Files with CRLF line endings
gradlew.bat text eol=crlf
+30
View File
@@ -1,5 +1,35 @@
# Changelog # Changelog
## 3.9.5.0 (versionCode 47, 2025-07-06)
- Update to moasdawiki-server 3.9.5
- Upgrade to Android API 36 (Android 16)
- Upgrade to Gradle 8.14.3
- Upgrade library dependencies
- Fix warning
## 3.9.3.0 (versionCode 46, 2025-01-05)
- Update to moasdawiki-server 3.9.3
- Upgrade to Gradle 8.12
- Upgrade library dependencies
- Update copyright year
## 3.9.1.1 (versionCode 45, 2024-11-02)
- Update App sync description
- Upgrade library dependencies
## 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) ## 3.7.1.0 (versionCode 42, 2024-01-01)
- Update to moasdawiki-server 3.7.1 - Update to moasdawiki-server 3.7.1
+10 -9
View File
@@ -12,6 +12,7 @@ For MoasdaWiki documentation see https://moasdawiki.net/.
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
alt="Get it on F-Droid" alt="Get it on F-Droid"
height="80">](https://f-droid.org/packages/net.moasdawiki.app) height="80">](https://f-droid.org/packages/net.moasdawiki.app)
or [Google Play](https://play.google.com/store/apps/details?id=net.moasdawiki.app)
## Features ## Features
@@ -33,15 +34,15 @@ For MoasdaWiki documentation see https://moasdawiki.net/.
1. Download MoasdaWiki Server from https://gitlab.com/moasdawiki/moasdawiki-server. 1. Download MoasdaWiki Server from https://gitlab.com/moasdawiki/moasdawiki-server.
2. Set up a MoasdaWiki Server instance in your LAN. 2. Set up a MoasdaWiki Server instance in your LAN.
3. Install the MoasdaWiki App. 3. Enable LAN access to the server: Edit the repository file `config.txt` and change the setting `authentication.onlylocalhost = false`. Restart the server afterwards.
4. In the app you can see a hint that it has to be configured first. Press on that hint. 4. Install the MoasdaWiki App.
5. Press on "Host name" and enter the host name or IP address of the server instance, e.g. `192.168.1.101`. Press OK. 5. In the app you can see a hint that it has to be configured first. Press on that hint.
6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again. 6. Press on "Host name" and enter the host name or IP address of the server instance, e.g. `192.168.1.101`. Press OK.
7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization". 7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant". 8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
9. Back in the app press the back button (&larr;) on the upper left corner to get back to the main dialog. 9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
Now you can see a hint that the app has to be synchronized. Press on that hint. 10. Back in the app press the back button (&larr;) on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page. 11. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
## Support ## Support
+10 -10
View File
@@ -1,25 +1,25 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
namespace "net.moasdawiki.app" namespace = "net.moasdawiki.app"
compileSdk 34 // 34 = Android 14 compileSdk = 36 // 36 = Android 16
defaultConfig { defaultConfig {
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 = 36 // should be same as compileSdk
versionCode 42 versionCode = 47
versionName "3.7.1.0" versionName = "3.9.5.0"
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_11 sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11
} }
buildFeatures { buildFeatures {
buildConfig true buildConfig = true
} }
lintOptions { lintOptions {
// Workaround for NullPointerException in :app:lintVitalAnalyzeRelease in fdroid build // Workaround for NullPointerException in :app:lintVitalAnalyzeRelease in fdroid build
checkReleaseBuilds false checkReleaseBuilds = false
} }
base { base {
archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
@@ -27,12 +27,12 @@ android {
} }
dependencies { dependencies {
api 'net.moasdawiki:moasdawiki-server:3.7.1' api 'net.moasdawiki:moasdawiki-server:3.9.5'
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:26.0.2'
} }
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -276,6 +276,7 @@ public class MainActivity extends AppCompatActivity {
// Close app // Close app
finish(); finish();
} }
super.onBackPressed();
} }
public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) { public void onConfigurationHintClicked(@SuppressWarnings("unused") View view) {
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
@@ -1,6 +1,6 @@
/* /*
* MoasdaWiki App * MoasdaWiki App
* Copyright (C) 2008 - 2024 Herbert Reiter (herbert@moasdawiki.net) * Copyright (C) 2008 - 2025 Herbert Reiter (herbert@moasdawiki.net)
* *
* This program is free software: you can redistribute it and/or modify it * 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 * under the terms of the GNU General Public License version 3 as published
+1 -1
View File
@@ -6,7 +6,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.2.0' classpath 'com.android.tools.build:gradle:8.10.1'
// 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 @@
- 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,2 @@
- Anleitung für App-Synchronisierung ergänzen
- Bibliotheks-Abhängigkeiten aktualisieren
@@ -0,0 +1,4 @@
- Auf moasdawiki-server 3.9.3 aktualisieren
- Gradle-Upgrade auf 8.12
- Bibliotheks-Abhängigkeiten aktualisieren
- Copyright-Jahr aktualisieren
@@ -0,0 +1,5 @@
- Auf moasdawiki-server 3.9.5 aktualisieren
- Android API 36 (Android 16) unterstützen
- Gradle-Upgrade auf 8.14.3
- Bibliotheks-Abhängigkeiten aktualisieren
- Warnung beheben
@@ -11,13 +11,14 @@ MoasdaWiki App ist eine datenschutzfreundliche Oberfläche der MoasdaWiki-Server
1. Lade MoasdaWiki-Server von https://moasdawiki.net/ herunter. 1. Lade MoasdaWiki-Server von https://moasdawiki.net/ herunter.
2. Setze eine MoasdaWiki-Server-Instance in deinem LAN auf. 2. Setze eine MoasdaWiki-Server-Instance in deinem LAN auf.
3. Installiere die MoasdaWiki-App. 3. Erlaube LAN-Zugriff auf den Server: Editiere die Datei config.txt im Repository und ändere die Einstellung authentication.onlylocalhost = false. Anschließend den Server neu starten.
4. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis. 4. Installiere die MoasdaWiki-App.
5. Drücke auf "Hostname" und gib den Hostnamen oder IP-Adresse der Server-Instanz ein, z.B. 192.168.1.101. Drücke OK. 5. In der App kannst du einen Hinweis sehen, dass sie zunächst konfiguriert werden muss. Drücke auf den Hinweis.
6. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port. 6. Drücke auf "Hostname" und gib den Hostnamen oder IP-Adresse der Server-Instanz ein, z.B. 192.168.1.101. Drücke OK.
7. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung". 7. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
8. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben". 8. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
9. Zurück in der App drücke den Zurück-Button in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis. 9. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen. 10. Zurück in der App drücke den Zurück-Button in der Ecke links oben, um zum Hauptdialog zurückzukommen. Nun kannst du einen Hinweis sehen, dass die App synchronisiert werden muss. Drücke auf diesen Hinweis.
11. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.
Hinweis: Der Wikiinhalt kann nicht in der App modifiziert werden, da es keinen Spaß macht Wiki-Syntax auf dem Mobilgerät zu tippen. Änderungen müssen über den MoasdaWiki-Server erfolgen. Hinweis: Der Wikiinhalt kann nicht in der App modifiziert werden, da es keinen Spaß macht Wiki-Syntax auf dem Mobilgerät zu tippen. Änderungen müssen über den MoasdaWiki-Server erfolgen.
@@ -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
@@ -0,0 +1,2 @@
- Update App sync description
- Upgrade library dependencies
@@ -0,0 +1,4 @@
- Update to moasdawiki-server 3.9.3
- Upgrade to Gradle 8.12
- Upgrade library dependencies
- Update copyright year
@@ -0,0 +1,5 @@
- Update to moasdawiki-server 3.9.5
- Upgrade to Android API 36 (Android 16)
- Upgrade to Gradle 8.14.3
- Upgrade library dependencies
- Fix warning
@@ -12,13 +12,14 @@ knowledge management tool. It mirrors the Wiki content on your mobile device.
1. Download MoasdaWiki Server from https://moasdawiki.net/. 1. Download MoasdaWiki Server from https://moasdawiki.net/.
2. Set up a MoasdaWiki Server instance in your LAN. 2. Set up a MoasdaWiki Server instance in your LAN.
3. Install the MoasdaWiki App. 3. Enable LAN access to the server: Edit the repository file config.txt and change the setting authentication.onlylocalhost = false. Restart the server afterwards.
4. In the app you can see a hint that it has to be configured first. Press on that hint. 4. Install the MoasdaWiki App.
5. Press on "Host name" and enter the host name or IP address of the server instance, e.g. 192.168.1.101. Press OK. 5. In the app you can see a hint that it has to be configured first. Press on that hint.
6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again. 6. Press on "Host name" and enter the host name or IP address of the server instance, e.g. 192.168.1.101. Press OK.
7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization". 7. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant". 8. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
9. Back in the app press the back button on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint. 9. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page. 10. Back in the app press the back button on the upper left corner to get back to the main dialog. Now you can see a hint that the app has to be synchronized. Press on that hint.
11. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.
Hint: Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device, changes have to be done via the MoasdaWiki Server. Hint: Content cannot be modified within the app as it is no fun to type Wiki syntax on the mobile device, changes have to be done via the MoasdaWiki Server.
+1 -19
View File
@@ -1,21 +1,3 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true android.useAndroidX=true
org.gradle.jvmargs=-Xmx3100M org.gradle.jvmargs=-Xmx3100M
org.gradle.warning.mode=all
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=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026 distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
Vendored
+4 -2
View File
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # 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 APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
# 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
Vendored
+94 -92
View File
@@ -1,92 +1,94 @@
@rem @rem
@rem Copyright 2015 the original author or authors. @rem Copyright 2015 the original author or authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at @rem You may obtain a copy of the License at
@rem @rem
@rem https://www.apache.org/licenses/LICENSE-2.0 @rem https://www.apache.org/licenses/LICENSE-2.0
@rem @rem
@rem Unless required by applicable law or agreed to in writing, software @rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS, @rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@if "%DEBUG%"=="" @echo off @rem
@rem ##########################################################################
@rem @if "%DEBUG%"=="" @echo off
@rem Gradle startup script for Windows @rem ##########################################################################
@rem @rem
@rem ########################################################################## @rem Gradle startup script for Windows
@rem
@rem Set local scope for the variables with windows NT shell @rem ##########################################################################
if "%OS%"=="Windows_NT" setlocal
@rem Set local scope for the variables with windows NT shell
set DIRNAME=%~dp0 if "%OS%"=="Windows_NT" setlocal
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused set DIRNAME=%~dp0
set APP_BASE_NAME=%~n0 if "%DIRNAME%"=="" set DIRNAME=.
set APP_HOME=%DIRNAME% @rem This is normally unused
set APP_BASE_NAME=%~n0
@rem Resolve any "." and ".." in APP_HOME to make it shorter. set APP_HOME=%DIRNAME%
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
@rem Find java.exe set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
if defined JAVA_HOME goto findJavaFromJavaHome
@rem Find java.exe
set JAVA_EXE=java.exe if defined JAVA_HOME goto findJavaFromJavaHome
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
echo. if %ERRORLEVEL% equ 0 goto execute
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo location of your Java installation. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
goto fail echo location of your Java installation. 1>&2
:findJavaFromJavaHome goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe :findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
if exist "%JAVA_EXE%" goto execute set JAVA_EXE=%JAVA_HOME%/bin/java.exe
echo. if exist "%JAVA_EXE%" goto execute
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo location of your Java installation. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
goto fail echo location of your Java installation. 1>&2
:execute goto fail
@rem Setup the command line
:execute
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
@rem Execute Gradle
:end "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd :end
@rem End local scope for the variables with windows NT shell
:fail if %ERRORLEVEL% equ 0 goto mainEnd
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! :fail
set EXIT_CODE=%ERRORLEVEL% rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
if %EXIT_CODE% equ 0 set EXIT_CODE=1 rem the _cmd.exe /c_ return code!
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% set EXIT_CODE=%ERRORLEVEL%
exit /b %EXIT_CODE% if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
:mainEnd exit /b %EXIT_CODE%
if "%OS%"=="Windows_NT" endlocal
:mainEnd
:omega if "%OS%"=="Windows_NT" endlocal
:omega