New release

.gitignore

@@ -1,7 +1,7 @@
 # IntelliJ
 .idea/
 out/
-moasdawiki-app.iml
+*.iml
 
 # Gradle
 .gradle/

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 2.3.1.0 (versionCode 18, 2020-09-13)
+
+- Speed up full text search by a search index
+- Bugfix: Don't go back to start page after App restore
+- Update to moasdawiki-server 2.3.1
+
+## 2.2.1.1 (versionCode 17, 2020-09-08)
+
+- Add German fastlane metadata for F-Droid repository
+- Update library dependencies
+
+## 2.2.1.0 (versionCode 16, 2020-03-15)
+
+- Add fastlane metadata for F-Droid repository
+
 ## 2.2.0.0 (versionCode 15, 2020-02-08)
 
 - Speed up full text search by searching only in the page titles in the first step

README.md

@@ -5,7 +5,11 @@
 MoasdaWiki App is an extension of the MoasdaWiki Server to have a copy of
 your Wiki content on your mobile device.
 
-To download the app see https://moasdawiki.net/.
+For MoasdaWiki documentation see https://moasdawiki.net/.
+
+[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+    alt="Get it on F-Droid"
+    height="80">](https://f-droid.org/packages/net.moasdawiki.app)
 
 ## Features
 
@@ -18,7 +22,8 @@ To download the app see https://moasdawiki.net/.
 
 ## Synchronize content with a MoasdaWiki Server
 
-1. Ensure to have a MoasdaWiki Server instance running on a computer in your LAN.
+1. Download MoasdaWiki Server from https://gitlab.com/moasdawiki/moasdawiki-server.
+1. Set up a MoasdaWiki Server instance in your LAN.
 1. Install and open the MoasdaWiki App.
 1. You can see a hint that the App has to be configured first. Press on that hint.
 1. Press on "Host name" and enter the host name of the server instance, e.g. `192.168.1.101`. Press OK.

app/app.iml

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 29 Platform (2)" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.testng:testng:6.14.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.beust:jcommander:1.72@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.apache-extras.beanshell:bsh:2.0b6@jar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:18.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.preference:preference:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.viewpager:viewpager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-animated:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.coordinatorlayout:coordinatorlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.slidingpanelayout:slidingpanelayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
-    <orderEntry type="module" module-name="moasdawiki-app" />
-  </component>
-</module>

app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "net.moasdawiki.app"
         minSdkVersion 26 // 26 = Oreo 8.0
         targetSdkVersion 29 // should be same as compileSdkVersion
-        versionCode 15
+        versionCode 18
-        versionName "2.2.0.0"
+        versionName "2.3.1.0"
         archivesBaseName = "moasdawiki-" + versionName + "-" + versionCode
     }
     sourceSets {
@@ -24,10 +24,10 @@ android {
 }
 
 dependencies {
-    implementation 'net.moasdawiki:moasdawiki-server:2.2.0'
+    implementation 'net.moasdawiki:moasdawiki-server:2.3.1'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
-    compileOnly 'org.jetbrains:annotations:18.0.0'
+    compileOnly 'org.jetbrains:annotations:19.0.0'
     testImplementation 'org.testng:testng:6.14.3'
 }

app/src/main/java/net/moasdawiki/app/MainActivity.java

@@ -233,6 +233,7 @@ public class MainActivity extends AppCompatActivity {
         return result;
     }
 
+    @SuppressLint("RestrictedApi")
     @Override
     public boolean onCreateOptionsMenu(@NotNull Menu menu) {
         // Inflate the menu; this adds items to the action bar if it is present.
@@ -413,7 +414,7 @@ public class MainActivity extends AppCompatActivity {
         boolean webViewVisible = !hostUnconfiguredHintVisible && !repositoryEmptyHintVisible;
         if (webViewVisible) {
             searchArea.setVisibility(View.VISIBLE);
-            boolean previousVisible = (webView.getVisibility() == View.INVISIBLE);
+            boolean previousVisible = (webView.getVisibility() == View.VISIBLE);
             webView.setVisibility(View.VISIBLE);
 
             // if WebView is shown the first time, go to start page

app/src/main/java/net/moasdawiki/app/WikiEngineApplication.java

@@ -57,7 +57,7 @@ public class WikiEngineApplication extends Application {
         RepositoryService repositoryService = new FilesystemRepositoryService(logger, internalStorageRepositoryRoot);
         repositoryService.init();
         WikiService wikiService = new WikiServiceImpl(logger, repositoryService);
-        SearchService searchService = new SearchService(logger, wikiService);
+        SearchService searchService = new SearchService(logger, repositoryService, wikiService);
         Settings settings = new AndroidSettings(logger, repositoryService, AndroidSettings.getConfigFileApp());
         Messages messages = new Messages(logger, settings, repositoryService);
         PluginService pluginService = new PluginService(logger, settings);

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fastlane/metadata/android/de/changelogs/15.txt

@@ -0,0 +1 @@
+- Volltextsuche beschleunigen, indem im ersten Schritt nur noch in den Seitentiteln gesucht wird.

fastlane/metadata/android/de/changelogs/16.txt

@@ -0,0 +1 @@
+- Fastlane Metadaten für das F-Droid-Repository hinzufügen

fastlane/metadata/android/de/changelogs/17.txt

@@ -0,0 +1,2 @@
+- Deutsche Fastlane Metadaten für das F-Droid-Repository hinzufügen
+- Versionen der verwendeten Bibliotheken aktualisieren

fastlane/metadata/android/de/changelogs/18.txt

@@ -0,0 +1,3 @@
+- Volltextsuche beschleunigen durch einen Suchindex
+- Bugfix: Nicht zur Wiki-Startseite wechseln wenn die App wieder geöffnet wird
+- Auf moasdawiki-server 2.3.1 aktualisieren

fastlane/metadata/android/de/full_description.txt

@@ -0,0 +1,22 @@
+MoasdaWiki App ist eine Erweiterung zum MoasdaWiki-Server, um eine Kopie deiner Wikiinhalte auf deinem Mobilgerät zu haben.
+
+Funkionalitäten:
+
+- Synchronisiert die Inhalte von einer MoasdaWiki-Server-Instanz.
+- Datenschutz: Es wird keine Cloud-Verbindung hergestellt, verbindet sich direkt mit dem Server in deinem privaten Netzwerk.
+- Flexible Volltextsuche, unterstützt reguläre Ausdrücke.
+- 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.
+- Kalender-Integration, zeigt Geburtstage und Termine im Kalender des Mobilgeräts (nur in der deutschen Version).
+
+Synchronisieren des Inhalts mit einem MoasdaWiki-Server:
+
+1. Lade MoasdaWiki-Server von https://moasdawiki.net/ herunter.
+2. Setze eine MoasdaWiki-Server-Instance in deinem LAN auf.
+3. Installiere und öffne die MoasdaWiki-App.
+4. Du kannst einen Hinweis sehen, dass die App zunächst konfiguriert werden muss. Drücke auf den Hinweis.
+5. Drücke auf "Hostname" und gib den Hostnamen der Server-Instanz ein, z.B. `192.168.1.101`. Drücke OK.
+6. Im Statusbereich darunter solltest du nun "Erfordert Berechtigung am Server" sehen. Andernfalls prüfe erneut Hostname und Port.
+7. Öffne auf der Serverseite die Wikiseite im Browser, klicke auf "Hilfe" und "Synchronisierung".
+8. Du siehst eine Liste von Geräte und Synchronisierungs-Sitzungen. Überprüfe den Gerätenamen und klicke auf "Erlauben".
+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.
+10. Nun solltest du alle Inhalte des Servers auch in der App haben und die Wikiseite "Startseite-App" sehen.

fastlane/metadata/android/de/short_description.txt

@@ -0,0 +1 @@
+App zum Synchronizieren der Inhalte vom MoasdaWiki-Server.

fastlane/metadata/android/en-US/changelogs/15.txt

@@ -0,0 +1 @@
+- Speed up full text search by searching only in the page titles in the first step

fastlane/metadata/android/en-US/changelogs/16.txt

@@ -0,0 +1 @@
+- Add fastlane metadata for F-Droid repository

fastlane/metadata/android/en-US/changelogs/17.txt

@@ -0,0 +1,2 @@
+- Add German fastlane metadata for F-Droid repository
+- Update library dependencies

fastlane/metadata/android/en-US/changelogs/18.txt

@@ -0,0 +1,3 @@
+- Speed up full text search by a search index
+- Bugfix: Don't go back to start page after App restore
+- Update to moasdawiki-server 2.3.1

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,22 @@
+MoasdaWiki App is an extension of the MoasdaWiki Server to have a copy of your Wiki content on your mobile device.
+
+Features:
+
+- Synchronizes the data from a MoasdaWiki Server instance.
+- Data privacy: No cloud connection established, directly connects to the server inside your private network.
+- Powerful full text search, supports regular expressions.
+- 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.
+- Calendar integration, shows birthdays and events in the mobile calendar (German version only).
+
+Synchronize content with a MoasdaWiki Server:
+
+1. Download MoasdaWiki Server from https://moasdawiki.net/.
+2. Set up a MoasdaWiki Server instance in your LAN.
+3. Install and open the MoasdaWiki App.
+4. You can see a hint that the App has to be configured first. Press on that hint.
+5. Press on "Host name" and enter the host name of the server instance, e.g. `192.168.1.101`. Press OK.
+6. In the status section below you should see "Needs authorization at server". Otherwise check host name and port again.
+7. On server side open the Wiki page in a browser, click on "Help" and "Synchronization".
+8. You can see a list of devices and synchronization sessions. Check the device name and click on "Grant".
+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.
+10. Now you should have all the server content also in the app and you can see the "Home-App" wiki page.

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+App to synchronize data from MoasdaWiki Server.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 01 21:15:49 CET 2020
+#Tue Sep 08 22:17:23 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip