From 9f54d48c18339f741e73eef2e0986d3e76ff86f5 Mon Sep 17 00:00:00 2001 From: Gregor Santner Date: Sat, 16 Jul 2022 14:01:38 +0200 Subject: [PATCH] Port changes related to Android SDK33 improvements, by @gsantner --- Makefile | 2 +- .../net/gsantner/markor/activity/DocumentEditFragment.java | 2 +- build.gradle | 1 - gradle/wrapper/gradle-wrapper.properties | 6 +++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index dc661cb45..2f4de8409 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ lint: rm -Rf $(DIST_DIR)/lint mkdir -p $(DIST_DIR)/lint/ $(MAKE) A="lintFlavorDefaultDebug" gradle - find app -type f -iname 'lint-results-*' | xargs cp -R -t $(DIST_DIR)/lint + find app -type f -iname 'lint-results-*' | grep -v 'intermediates' | xargs cp -R -t $(DIST_DIR)/lint $(MAKE) A="-lint" gradle-analyze-log test: diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java index bf7f11802..5bc0627e6 100644 --- a/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java +++ b/app/src/main/java/net/gsantner/markor/activity/DocumentEditFragment.java @@ -169,7 +169,7 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { webSettings.setBuiltInZoomControls(true); webSettings.setDisplayZoomControls(false); webSettings.setTextZoom((int) (_appSettings.getViewFontSize() / 15.7f * 100f)); - webSettings.setAppCacheEnabled(true); + webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); webSettings.setDatabaseEnabled(true); webSettings.setGeolocationEnabled(false); webSettings.setJavaScriptEnabled(true); diff --git a/build.gradle b/build.gradle index f1a231a36..a2addc357 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,6 @@ buildscript { repositories { maven { url 'https://maven.google.com' } - jcenter() maven { url "https://jitpack.io" } mavenCentral() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 505b369a3..ccaae63e3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jul 26 02:59:10 CEST 2019 +#Thu Dec 02 03:48:33 CET 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip +zipStoreBase=GRADLE_USER_HOME