@capacitor/android 5.0.0-beta.2 → 5.0.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/capacitor/build.gradle
CHANGED
|
@@ -22,7 +22,7 @@ buildscript {
|
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
dependencies {
|
|
25
|
-
classpath 'com.android.tools.build:gradle:
|
|
25
|
+
classpath 'com.android.tools.build:gradle:8.0.0'
|
|
26
26
|
|
|
27
27
|
if (System.getenv("CAP_PUBLISH") == "true") {
|
|
28
28
|
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
|
|
@@ -64,8 +64,8 @@ android {
|
|
|
64
64
|
lintConfig file('lint.xml')
|
|
65
65
|
}
|
|
66
66
|
compileOptions {
|
|
67
|
-
sourceCompatibility JavaVersion.
|
|
68
|
-
targetCompatibility JavaVersion.
|
|
67
|
+
sourceCompatibility JavaVersion.VERSION_17
|
|
68
|
+
targetCompatibility JavaVersion.VERSION_17
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
|
|
@@ -275,12 +275,8 @@ public class CapConfig {
|
|
|
275
275
|
String logBehavior = JSONUtils.getString(
|
|
276
276
|
configJSON,
|
|
277
277
|
"android.loggingBehavior",
|
|
278
|
-
JSONUtils.getString(configJSON, "loggingBehavior",
|
|
278
|
+
JSONUtils.getString(configJSON, "loggingBehavior", LOG_BEHAVIOR_DEBUG)
|
|
279
279
|
);
|
|
280
|
-
if (logBehavior == null) {
|
|
281
|
-
boolean hideLogs = JSONUtils.getBoolean(configJSON, "android.hideLogs", JSONUtils.getBoolean(configJSON, "hideLogs", false));
|
|
282
|
-
logBehavior = hideLogs ? LOG_BEHAVIOR_NONE : LOG_BEHAVIOR_DEBUG;
|
|
283
|
-
}
|
|
284
280
|
switch (logBehavior.toLowerCase(Locale.ROOT)) {
|
|
285
281
|
case LOG_BEHAVIOR_PRODUCTION:
|
|
286
282
|
loggingEnabled = true;
|
|
@@ -20,17 +20,18 @@ public class CapacitorCookies extends Plugin {
|
|
|
20
20
|
@Override
|
|
21
21
|
public void load() {
|
|
22
22
|
this.bridge.getWebView().addJavascriptInterface(this, "CapacitorCookiesAndroidInterface");
|
|
23
|
-
if (isEnabled()) {
|
|
24
|
-
this.cookieManager = new CapacitorCookieManager(null, java.net.CookiePolicy.ACCEPT_ALL, this.bridge);
|
|
25
|
-
CookieHandler.setDefault(cookieManager);
|
|
26
|
-
}
|
|
27
23
|
super.load();
|
|
28
24
|
}
|
|
29
25
|
|
|
30
26
|
@JavascriptInterface
|
|
31
27
|
public boolean isEnabled() {
|
|
32
28
|
PluginConfig pluginConfig = getBridge().getConfig().getPluginConfiguration("CapacitorCookies");
|
|
33
|
-
|
|
29
|
+
boolean isEnabled = pluginConfig.getBoolean("enabled", false);
|
|
30
|
+
if (isEnabled) {
|
|
31
|
+
this.cookieManager = new CapacitorCookieManager(null, java.net.CookiePolicy.ACCEPT_ALL, this.bridge);
|
|
32
|
+
CookieHandler.setDefault(cookieManager);
|
|
33
|
+
}
|
|
34
|
+
return isEnabled;
|
|
34
35
|
}
|
|
35
36
|
|
|
36
37
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@capacitor/android",
|
|
3
|
-
"version": "5.0.0-beta.
|
|
3
|
+
"version": "5.0.0-beta.3",
|
|
4
4
|
"description": "Capacitor: Cross-platform apps with JavaScript and the web",
|
|
5
5
|
"homepage": "https://capacitorjs.com",
|
|
6
6
|
"author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
|
|
@@ -23,10 +23,10 @@
|
|
|
23
23
|
"verify": "./gradlew clean lint build test -b capacitor/build.gradle"
|
|
24
24
|
},
|
|
25
25
|
"peerDependencies": {
|
|
26
|
-
"@capacitor/core": "^5.0.0-beta.
|
|
26
|
+
"@capacitor/core": "^5.0.0-beta.2"
|
|
27
27
|
},
|
|
28
28
|
"publishConfig": {
|
|
29
29
|
"access": "public"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "60ffcc36bc4948876b94f1f7a0470c68b6a7e50f"
|
|
32
32
|
}
|