Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Herbert Reiter
|
d021267fcd | ||
|
Herbert Reiter
|
6cb3e218c4 | ||
|
Herbert Reiter
|
7b3aa69732 | ||
|
Herbert Reiter
|
9f2c84d673 | ||
|
Herbert Reiter
|
0ba9bfda35 | ||
|
Herbert Reiter
|
dcbfc23070 | ||
|
Herbert Reiter
|
42d01a9abe | ||
|
Herbert Reiter
|
67e30728f0 | ||
|
Herbert Reiter
|
75a186f37c | ||
|
Herbert Reiter
|
74c539c1de | ||
|
Herbert Reiter
|
7a9626e860 | ||
|
Herbert Reiter
|
63d4dc289e | ||
|
Herbert Reiter
|
742770826e | ||
|
Herbert Reiter
|
9887622c75 | ||
|
Herbert Reiter
|
c159f7b654 | ||
|
Herbert Reiter
|
a5b1d6ab98 | ||
|
Herbert Reiter
|
0761586405 |
@@ -0,0 +1,4 @@
|
|||||||
|
*.sh text eol=lf
|
||||||
|
|
||||||
|
# Files with CRLF line endings
|
||||||
|
gradlew.bat text eol=crlf
|
||||||
@@ -1,5 +1,34 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 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)
|
||||||
|
|
||||||
|
- 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)
|
## 3.6.3.0 (versionCode 39, 2023-11-11)
|
||||||
|
|
||||||
- Limit calendar import to 100 events as Android has a global limit of 500 events
|
- Limit calendar import to 100 events as Android has a global limit of 500 events
|
||||||
|
|||||||
@@ -33,15 +33,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 (←) 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 (←) 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
|
||||||
|
|
||||||
|
|||||||
+8
-4
@@ -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 39
|
versionCode 45
|
||||||
versionName "3.6.3.0"
|
versionName "3.9.1.1"
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_11
|
sourceCompatibility JavaVersion.VERSION_11
|
||||||
@@ -17,18 +17,22 @@ android {
|
|||||||
buildFeatures {
|
buildFeatures {
|
||||||
buildConfig true
|
buildConfig true
|
||||||
}
|
}
|
||||||
|
lintOptions {
|
||||||
|
// Workaround for NullPointerException in :app:lintVitalAnalyzeRelease in fdroid build
|
||||||
|
checkReleaseBuilds false
|
||||||
|
}
|
||||||
base {
|
base {
|
||||||
archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
|
archivesName = "moasdawiki-" + defaultConfig.versionName + "-" + defaultConfig.versionCode
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api 'net.moasdawiki:moasdawiki-server:3.6.3'
|
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.0.1'
|
compileOnly 'org.jetbrains:annotations:26.0.1'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* MoasdaWiki App
|
* 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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 - 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
|
* 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
@@ -6,7 +6,7 @@ buildscript {
|
|||||||
google()
|
google()
|
||||||
}
|
}
|
||||||
dependencies {
|
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
|
// 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 @@
|
|||||||
|
- 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,2 @@
|
|||||||
|
- Anleitung für App-Synchronisierung ergänzen
|
||||||
|
- Bibliotheks-Abhängigkeiten aktualisieren
|
||||||
@@ -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 @@
|
|||||||
|
- 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
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
- Update App sync description
|
||||||
|
- Upgrade library dependencies
|
||||||
@@ -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.
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
|
distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-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
|
||||||
|
|||||||
@@ -83,7 +83,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
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.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -144,7 +145,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=SC2039,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 +153,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=SC2039,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
|
||||||
@@ -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.
|
# 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"'
|
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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# and any embedded shellness will be escaped.
|
||||||
# double quotes to make sure that they get re-expanded; and
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|||||||
Vendored
+92
-92
@@ -1,92 +1,92 @@
|
|||||||
@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
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem Gradle startup script for Windows
|
@rem Gradle startup script for Windows
|
||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
@rem Set local scope for the variables with windows NT shell
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
@rem This is normally unused
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||||
|
|
||||||
@rem Find java.exe
|
@rem Find java.exe
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
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
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
:findJavaFromJavaHome
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
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
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
:fail
|
:fail
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
rem the _cmd.exe /c_ return code!
|
rem the _cmd.exe /c_ return code!
|
||||||
set EXIT_CODE=%ERRORLEVEL%
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
exit /b %EXIT_CODE%
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|
||||||
:omega
|
:omega
|
||||||
|
|||||||
Reference in New Issue
Block a user