From cdbad21a10a02815324cd854faf95560317fc1e1 Mon Sep 17 00:00:00 2001 From: JeffZhao Date: Thu, 31 Aug 2023 18:07:03 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=87=E7=BA=A7rn0.72.?= =?UTF-8?q?4=20=E7=9A=84=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/reactnativecommunity/webview/RNCWebViewManager.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java b/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java index a41c6f7df..9477d5e33 100644 --- a/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java +++ b/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java @@ -323,13 +323,10 @@ public void setCacheEnabled(WebView view, boolean enabled) { if (enabled) { Context ctx = view.getContext(); if (ctx != null) { - view.getSettings().setAppCachePath(ctx.getCacheDir().getAbsolutePath()); view.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT); - view.getSettings().setAppCacheEnabled(true); } } else { view.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE); - view.getSettings().setAppCacheEnabled(false); } } @@ -523,7 +520,6 @@ public void setIncognito(WebView view, boolean enabled) { // Disable caching view.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE); - view.getSettings().setAppCacheEnabled(false); view.clearHistory(); view.clearCache(true); From 77a1dfb2b81f2e246a59a7b601c75bb259e28d13 Mon Sep 17 00:00:00 2001 From: JeffZhao Date: Thu, 31 Aug 2023 18:19:39 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20build.gradle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 改为使用 java 11 --- android/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index e6d05084b..337466295 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,7 +9,7 @@ buildscript { if (project == rootProject) { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -35,6 +35,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { + compileSdkVersion getExtOrIntegerDefault('compileSdkVersion') buildToolsVersion getExtOrDefault('buildToolsVersion') defaultConfig { @@ -52,14 +53,13 @@ android { disable 'GradleCompatible' } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 } } repositories { mavenCentral() - jcenter() google() def found = false From 606f09480ed8c3cccee13f1e8d975571130e06b8 Mon Sep 17 00:00:00 2001 From: Jeff Zhao Date: Sat, 2 Sep 2023 10:09:01 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20gradle=20=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0namespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 620f36927a2755a894b51f4885304d41dbca6191) # Conflicts: # android/build.gradle --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 337466295..9aaf91f89 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -18,7 +18,7 @@ buildscript { } } else { repositories { - jcenter() + mavenCentral() } dependencies { @@ -35,7 +35,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - + namespace "com.reactnativecommunity.webview" compileSdkVersion getExtOrIntegerDefault('compileSdkVersion') buildToolsVersion getExtOrDefault('buildToolsVersion') defaultConfig {