@capacitor/android 7.0.0-alpha.2 → 7.0.0-beta.0

package/capacitor/build.gradle

@@ -13,7 +13,7 @@ ext {
 
 
 buildscript {
-    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.10'
+    ext.kotlin_version = project.hasProperty("kotlin_version") ? rootProject.ext.kotlin_version : '1.9.25'
     repositories {
         google()
         mavenCentral()
@@ -22,7 +22,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.0'
+        classpath 'com.android.tools.build:gradle:8.7.2'
 
         if (System.getenv("CAP_PUBLISH") == "true") {
             classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
@@ -64,8 +64,8 @@ android {
         lintConfig file('lint.xml')
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
     publishing {
         singleVariant("release")

package/capacitor/src/main/java/com/getcapacitor/Bridge.java

@@ -15,7 +15,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.webkit.ServiceWorkerClient;
+import android.webkit.ServiceWorkerController;
 import android.webkit.ValueCallback;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import androidx.activity.result.ActivityResultCallback;
@@ -274,6 +278,18 @@ public class Bridge {
         webView.setWebChromeClient(new BridgeWebChromeClient(this));
         webView.setWebViewClient(this.webViewClient);
 
+        if (Build.VERSION.SDK_INT >= 24 && config.isResolveServiceWorkerRequests()) {
+            ServiceWorkerController swController = ServiceWorkerController.getInstance();
+            swController.setServiceWorkerClient(
+                new ServiceWorkerClient() {
+                    @Override
+                    public WebResourceResponse shouldInterceptRequest(WebResourceRequest request) {
+                        return getLocalServer().shouldInterceptRequest(request);
+                    }
+                }
+            );
+        }
+
         if (!isDeployDisabled() && !isNewBinary()) {
             SharedPreferences prefs = getContext()
                 .getSharedPreferences(com.getcapacitor.plugin.WebView.WEBVIEW_PREFS_NAME, Activity.MODE_PRIVATE);

package/capacitor/src/main/java/com/getcapacitor/CapConfig.java

@@ -53,6 +53,7 @@ public class CapConfig {
     private int minHuaweiWebViewVersion = DEFAULT_HUAWEI_WEBVIEW_VERSION;
     private String errorPath;
     private boolean zoomableWebView = false;
+    private boolean resolveServiceWorkerRequests = true;
 
     // Embedded
     private String startPath;
@@ -179,6 +180,7 @@ public class CapConfig {
         this.minHuaweiWebViewVersion = builder.minHuaweiWebViewVersion;
         this.errorPath = builder.errorPath;
         this.zoomableWebView = builder.zoomableWebView;
+        this.resolveServiceWorkerRequests = builder.resolveServiceWorkerRequests;
 
         // Embedded
         this.startPath = builder.startPath;
@@ -282,6 +284,7 @@ public class CapConfig {
         useLegacyBridge = JSONUtils.getBoolean(configJSON, "android.useLegacyBridge", useLegacyBridge);
         webContentsDebuggingEnabled = JSONUtils.getBoolean(configJSON, "android.webContentsDebuggingEnabled", isDebug);
         zoomableWebView = JSONUtils.getBoolean(configJSON, "android.zoomEnabled", JSONUtils.getBoolean(configJSON, "zoomEnabled", false));
+        resolveServiceWorkerRequests = JSONUtils.getBoolean(configJSON, "android.resolveServiceWorkerRequests", true);
 
         String logBehavior = JSONUtils.getString(
             configJSON,
@@ -299,7 +302,11 @@ public class CapConfig {
                 loggingEnabled = isDebug;
         }
 
-        initialFocus = JSONUtils.getBoolean(configJSON, "android.initialFocus", initialFocus);
+        initialFocus = JSONUtils.getBoolean(
+            configJSON,
+            "android.initialFocus",
+            JSONUtils.getBoolean(configJSON, "initialFocus", initialFocus)
+        );
 
         // Plugins
         pluginsConfiguration = deserializePluginsConfig(JSONUtils.getObject(configJSON, "plugins"));
@@ -370,6 +377,10 @@ public class CapConfig {
         return captureInput;
     }
 
+    public boolean isResolveServiceWorkerRequests() {
+        return resolveServiceWorkerRequests;
+    }
+
     public boolean isWebContentsDebuggingEnabled() {
         return webContentsDebuggingEnabled;
     }
@@ -569,6 +580,7 @@ public class CapConfig {
         private int minWebViewVersion = DEFAULT_ANDROID_WEBVIEW_VERSION;
         private int minHuaweiWebViewVersion = DEFAULT_HUAWEI_WEBVIEW_VERSION;
         private boolean zoomableWebView = false;
+        private boolean resolveServiceWorkerRequests = true;
 
         // Embedded
         private String startPath = null;
@@ -668,6 +680,11 @@ public class CapConfig {
             return this;
         }
 
+        public Builder setResolveServiceWorkerRequests(boolean resolveServiceWorkerRequests) {
+            this.resolveServiceWorkerRequests = resolveServiceWorkerRequests;
+            return this;
+        }
+
         public Builder setWebContentsDebuggingEnabled(boolean webContentsDebuggingEnabled) {
             this.webContentsDebuggingEnabled = webContentsDebuggingEnabled;
             return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/android",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-beta.0",
   "description": "Capacitor: Cross-platform apps with JavaScript and the web",
   "homepage": "https://capacitorjs.com",
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
@@ -23,7 +23,7 @@
     "verify": "./gradlew clean lint build test -b capacitor/build.gradle"
   },
   "peerDependencies": {
-    "@capacitor/core": "^7.0.0-alpha.2"
+    "@capacitor/core": "^7.0.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/capacitor/src/main/java/com/getcapacitor/BridgeFragment.java

@@ -1,133 +0,0 @@
-package com.getcapacitor;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.fragment.app.Fragment;
-import com.getcapacitor.android.R;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A simple {@link Fragment} subclass.
- * Use the {@link BridgeFragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-public class BridgeFragment extends Fragment {
-
-    private static final String ARG_START_DIR = "startDir";
-
-    protected Bridge bridge;
-    protected boolean keepRunning = true;
-
-    private final List<Class<? extends Plugin>> initialPlugins = new ArrayList<>();
-    private CapConfig config = null;
-
-    private final List<WebViewListener> webViewListeners = new ArrayList<>();
-
-    public BridgeFragment() {
-        // Required empty public constructor
-    }
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param startDir the directory to serve content from
-     * @return A new instance of fragment BridgeFragment.
-     */
-    public static BridgeFragment newInstance(String startDir) {
-        BridgeFragment fragment = new BridgeFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_START_DIR, startDir);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    public void addPlugin(Class<? extends Plugin> plugin) {
-        this.initialPlugins.add(plugin);
-    }
-
-    public void setConfig(CapConfig config) {
-        this.config = config;
-    }
-
-    public Bridge getBridge() {
-        return bridge;
-    }
-
-    public void addWebViewListener(WebViewListener webViewListener) {
-        webViewListeners.add(webViewListener);
-    }
-
-    /**
-     * Load the WebView and create the Bridge
-     */
-    protected void load(Bundle savedInstanceState) {
-        Logger.debug("Loading Bridge with BridgeFragment");
-
-        Bundle args = getArguments();
-        String startDir = null;
-
-        if (args != null) {
-            startDir = getArguments().getString(ARG_START_DIR);
-        }
-
-        bridge = new Bridge.Builder(this)
-            .setInstanceState(savedInstanceState)
-            .setPlugins(initialPlugins)
-            .setConfig(config)
-            .addWebViewListeners(webViewListeners)
-            .create();
-
-        if (startDir != null) {
-            bridge.setServerAssetPath(startDir);
-        }
-
-        this.keepRunning = bridge.shouldKeepRunning();
-    }
-
-    @Override
-    public void onInflate(Context context, AttributeSet attrs, Bundle savedInstanceState) {
-        super.onInflate(context, attrs, savedInstanceState);
-
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.bridge_fragment);
-        CharSequence c = a.getString(R.styleable.bridge_fragment_start_dir);
-
-        if (c != null) {
-            String startDir = c.toString();
-            Bundle args = new Bundle();
-            args.putString(ARG_START_DIR, startDir);
-            setArguments(args);
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_bridge, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        this.load(savedInstanceState);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (this.bridge != null) {
-            this.bridge.onDestroy();
-        }
-    }
-}

package/capacitor/src/main/res/layout/fragment_bridge.xml

@@ -1,13 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#F0FF1414"
-    tools:context="com.getcapacitor.BridgeFragment">
-
-  <com.getcapacitor.CapacitorWebView
-      android:id="@+id/webview"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent" />
-
-</FrameLayout>

package/capacitor/src/main/res/values/attrs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <declare-styleable name="bridge_fragment">
-    <attr name="start_dir" format="string"/>
-  </declare-styleable>
-</resources>