@capacitor/browser 6.0.4 → 7.0.0-alpha.2

package/CapacitorBrowser.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.author = package['author']
   s.source = { :git => 'https://github.com/ionic-team/capacitor-plugins.git', :tag => package['name'] + '@' + package['version'] }
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}', 'browser/ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
-  s.ios.deployment_target  = '13.0'
+  s.ios.deployment_target = '14.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'
 end

package/Package.swift

@@ -3,14 +3,14 @@ import PackageDescription
 
 let package = Package(
     name: "CapacitorBrowser",
-    platforms: [.iOS(.v13)],
+    platforms: [.iOS(.v14)],
     products: [
         .library(
             name: "CapacitorBrowser",
             targets: ["BrowserPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "6.0.0")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", branch: "main")
     ],
     targets: [
         .target(

package/README.md

@@ -17,7 +17,7 @@ npx cap sync
 
 This plugin will use the following project variables (defined in your app's `variables.gradle` file):
 
-- `androidxBrowserVersion`: version of `androidx.browser:browser` (default: `1.7.0`)
+- `androidxBrowserVersion`: version of `androidx.browser:browser` (default: `1.8.0`)
 
 ## Example
 

package/android/build.gradle

@@ -1,10 +1,10 @@
 ext {
     capacitorVersion = System.getenv('CAPACITOR_VERSION')
     junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
-    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
-    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
-    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
-    androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.7.0'
+    androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.7.0'
+    androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.2.1'
+    androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.6.1'
+    androidxBrowserVersion = project.hasProperty('androidxBrowserVersion') ? rootProject.ext.androidxBrowserVersion : '1.8.0'
 }
 
 buildscript {
@@ -16,7 +16,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
         if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
             classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
         }
@@ -32,10 +32,10 @@ if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
 
 android {
     namespace "com.capacitorjs.plugins.browser"
-    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
+    compileSdk project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 35
     defaultConfig {
-        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
-        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
+        minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 23
+        targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 35
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -50,8 +50,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
     publishing {
         singleVariant("release")

package/android/src/main/java/com/capacitorjs/plugins/browser/BrowserPlugin.java

@@ -60,25 +60,25 @@ public class BrowserPlugin extends Plugin {
         }
 
         // open the browser and finish
-        try {
-            Intent intent = new Intent(getContext(), BrowserControllerActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            getContext().startActivity(intent);
 
-            Integer finalToolbarColor = toolbarColor;
-            setBrowserControllerListener(
-                activity -> {
+        Intent intent = new Intent(getContext(), BrowserControllerActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(intent);
+
+        Integer finalToolbarColor = toolbarColor;
+        setBrowserControllerListener(
+            activity -> {
+                try {
                     activity.open(implementation, url, finalToolbarColor);
                     browserControllerActivityInstance = activity;
                     call.resolve();
+                } catch (ActivityNotFoundException ex) {
+                    Logger.error(getLogTag(), ex.getLocalizedMessage(), null);
+                    call.reject("Unable to display URL");
                 }
-            );
-        } catch (ActivityNotFoundException ex) {
-            Logger.error(getLogTag(), ex.getLocalizedMessage(), null);
-            call.reject("Unable to display URL");
-            return;
-        }
+            }
+        );
     }
 
     @PluginMethod

package/dist/plugin.cjs.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var core = require('@capacitor/core');
 
 const Browser$1 = core.registerPlugin('Browser', {
@@ -33,8 +31,8 @@ const Browser = new BrowserWeb();
 
 var web = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    BrowserWeb: BrowserWeb,
-    Browser: Browser
+    Browser: Browser,
+    BrowserWeb: BrowserWeb
 });
 
 exports.Browser = Browser$1;

package/dist/plugin.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst Browser = registerPlugin('Browser', {\n    web: () => import('./web').then(m => new m.BrowserWeb()),\n});\nexport * from './definitions';\nexport { Browser };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class BrowserWeb extends WebPlugin {\n    constructor() {\n        super();\n        this._lastWindow = null;\n    }\n    async open(options) {\n        this._lastWindow = window.open(options.url, options.windowName || '_blank');\n    }\n    async close() {\n        return new Promise((resolve, reject) => {\n            if (this._lastWindow != null) {\n                this._lastWindow.close();\n                this._lastWindow = null;\n                resolve();\n            }\n            else {\n                reject('No active window to close!');\n            }\n        });\n    }\n}\nconst Browser = new BrowserWeb();\nexport { Browser };\n//# sourceMappingURL=web.js.map"],"names":["Browser","registerPlugin","WebPlugin"],"mappings":";;;;;;AACK,MAACA,SAAO,GAAGC,mBAAc,CAAC,SAAS,EAAE;AAC1C,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;AAC5D,CAAC;;ACFM,MAAM,UAAU,SAASC,cAAS,CAAC;AAC1C,IAAI,WAAW,GAAG;AAClB,QAAQ,KAAK,EAAE,CAAC;AAChB,QAAQ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;AAChC,KAAK;AACL,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE;AACxB,QAAQ,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC,CAAC;AACpF,KAAK;AACL,IAAI,MAAM,KAAK,GAAG;AAClB,QAAQ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK;AAChD,YAAY,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;AAC1C,gBAAgB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;AACzC,gBAAgB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;AACxC,gBAAgB,OAAO,EAAE,CAAC;AAC1B,aAAa;AACb,iBAAiB;AACjB,gBAAgB,MAAM,CAAC,4BAA4B,CAAC,CAAC;AACrD,aAAa;AACb,SAAS,CAAC,CAAC;AACX,KAAK;AACL,CAAC;AACD,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE;;;;;;;;;;"}
+{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst Browser = registerPlugin('Browser', {\n    web: () => import('./web').then(m => new m.BrowserWeb()),\n});\nexport * from './definitions';\nexport { Browser };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class BrowserWeb extends WebPlugin {\n    constructor() {\n        super();\n        this._lastWindow = null;\n    }\n    async open(options) {\n        this._lastWindow = window.open(options.url, options.windowName || '_blank');\n    }\n    async close() {\n        return new Promise((resolve, reject) => {\n            if (this._lastWindow != null) {\n                this._lastWindow.close();\n                this._lastWindow = null;\n                resolve();\n            }\n            else {\n                reject('No active window to close!');\n            }\n        });\n    }\n}\nconst Browser = new BrowserWeb();\nexport { Browser };\n//# sourceMappingURL=web.js.map"],"names":["Browser","registerPlugin","WebPlugin"],"mappings":";;;;AACK,MAACA,SAAO,GAAGC,mBAAc,CAAC,SAAS,EAAE;AAC1C,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;AAC5D,CAAC;;ACFM,MAAM,UAAU,SAASC,cAAS,CAAC;AAC1C,IAAI,WAAW,GAAG;AAClB,QAAQ,KAAK,EAAE;AACf,QAAQ,IAAI,CAAC,WAAW,GAAG,IAAI;AAC/B;AACA,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE;AACxB,QAAQ,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC;AACnF;AACA,IAAI,MAAM,KAAK,GAAG;AAClB,QAAQ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK;AAChD,YAAY,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;AAC1C,gBAAgB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;AACxC,gBAAgB,IAAI,CAAC,WAAW,GAAG,IAAI;AACvC,gBAAgB,OAAO,EAAE;AACzB;AACA,iBAAiB;AACjB,gBAAgB,MAAM,CAAC,4BAA4B,CAAC;AACpD;AACA,SAAS,CAAC;AACV;AACA;AACA,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE;;;;;;;;;;"}

package/dist/plugin.js

@@ -30,14 +30,12 @@ var capacitorBrowser = (function (exports, core) {
 
     var web = /*#__PURE__*/Object.freeze({
         __proto__: null,
-        BrowserWeb: BrowserWeb,
-        Browser: Browser
+        Browser: Browser,
+        BrowserWeb: BrowserWeb
     });
 
     exports.Browser = Browser$1;
 
-    Object.defineProperty(exports, '__esModule', { value: true });
-
     return exports;
 
 })({}, capacitorExports);

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst Browser = registerPlugin('Browser', {\n    web: () => import('./web').then(m => new m.BrowserWeb()),\n});\nexport * from './definitions';\nexport { Browser };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class BrowserWeb extends WebPlugin {\n    constructor() {\n        super();\n        this._lastWindow = null;\n    }\n    async open(options) {\n        this._lastWindow = window.open(options.url, options.windowName || '_blank');\n    }\n    async close() {\n        return new Promise((resolve, reject) => {\n            if (this._lastWindow != null) {\n                this._lastWindow.close();\n                this._lastWindow = null;\n                resolve();\n            }\n            else {\n                reject('No active window to close!');\n            }\n        });\n    }\n}\nconst Browser = new BrowserWeb();\nexport { Browser };\n//# sourceMappingURL=web.js.map"],"names":["Browser","registerPlugin","WebPlugin"],"mappings":";;;AACK,UAACA,SAAO,GAAGC,mBAAc,CAAC,SAAS,EAAE;IAC1C,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;IAC5D,CAAC;;ICFM,MAAM,UAAU,SAASC,cAAS,CAAC;IAC1C,IAAI,WAAW,GAAG;IAClB,QAAQ,KAAK,EAAE,CAAC;IAChB,QAAQ,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAChC,KAAK;IACL,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE;IACxB,QAAQ,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC,CAAC;IACpF,KAAK;IACL,IAAI,MAAM,KAAK,GAAG;IAClB,QAAQ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK;IAChD,YAAY,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;IAC1C,gBAAgB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IACzC,gBAAgB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IACxC,gBAAgB,OAAO,EAAE,CAAC;IAC1B,aAAa;IACb,iBAAiB;IACjB,gBAAgB,MAAM,CAAC,4BAA4B,CAAC,CAAC;IACrD,aAAa;IACb,SAAS,CAAC,CAAC;IACX,KAAK;IACL,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst Browser = registerPlugin('Browser', {\n    web: () => import('./web').then(m => new m.BrowserWeb()),\n});\nexport * from './definitions';\nexport { Browser };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class BrowserWeb extends WebPlugin {\n    constructor() {\n        super();\n        this._lastWindow = null;\n    }\n    async open(options) {\n        this._lastWindow = window.open(options.url, options.windowName || '_blank');\n    }\n    async close() {\n        return new Promise((resolve, reject) => {\n            if (this._lastWindow != null) {\n                this._lastWindow.close();\n                this._lastWindow = null;\n                resolve();\n            }\n            else {\n                reject('No active window to close!');\n            }\n        });\n    }\n}\nconst Browser = new BrowserWeb();\nexport { Browser };\n//# sourceMappingURL=web.js.map"],"names":["Browser","registerPlugin","WebPlugin"],"mappings":";;;AACK,UAACA,SAAO,GAAGC,mBAAc,CAAC,SAAS,EAAE;IAC1C,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;IAC5D,CAAC;;ICFM,MAAM,UAAU,SAASC,cAAS,CAAC;IAC1C,IAAI,WAAW,GAAG;IAClB,QAAQ,KAAK,EAAE;IACf,QAAQ,IAAI,CAAC,WAAW,GAAG,IAAI;IAC/B;IACA,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE;IACxB,QAAQ,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAC;IACnF;IACA,IAAI,MAAM,KAAK,GAAG;IAClB,QAAQ,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK;IAChD,YAAY,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;IAC1C,gBAAgB,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;IACxC,gBAAgB,IAAI,CAAC,WAAW,GAAG,IAAI;IACvC,gBAAgB,OAAO,EAAE;IACzB;IACA,iBAAiB;IACjB,gBAAgB,MAAM,CAAC,4BAA4B,CAAC;IACpD;IACA,SAAS,CAAC;IACV;IACA;IACA,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE;;;;;;;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/browser",
-  "version": "6.0.4",
+  "version": "7.0.0-alpha.2",
   "description": "The Browser API provides the ability to open an in-app browser and subscribe to browser events.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -31,7 +31,7 @@
   ],
   "scripts": {
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "xcodebuild build -scheme CapacitorBrowser -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
+    "verify:ios": "xcodebuild build -scheme CapacitorBrowser -destination generic/platform=iOS",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
@@ -40,30 +40,30 @@
     "prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api BrowserPlugin --output-readme README.md --output-json dist/docs.json",
-    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.js",
+    "build": "npm run clean && npm run docgen && tsc && rollup -c rollup.config.mjs",
     "clean": "rimraf ./dist",
     "watch": "tsc --watch",
     "prepublishOnly": "npm run build",
     "publish:cocoapod": "pod trunk push ./CapacitorBrowser.podspec --allow-warnings"
   },
   "devDependencies": {
-    "@capacitor/android": "^6.0.0",
-    "@capacitor/core": "^6.0.0",
+    "@capacitor/android": "next",
+    "@capacitor/core": "next",
     "@capacitor/docgen": "0.2.2",
-    "@capacitor/ios": "^6.0.0",
+    "@capacitor/ios": "next",
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "~1.0.1",
     "@ionic/swiftlint-config": "^1.1.2",
     "eslint": "^8.57.0",
     "prettier": "~2.3.0",
     "prettier-plugin-java": "~1.0.2",
-    "rimraf": "^3.0.0",
-    "rollup": "^2.29.0",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.26.0",
     "swiftlint": "^1.0.1",
     "typescript": "~4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^6.0.0"
+    "@capacitor/core": "next"
   },
   "prettier": "@ionic/prettier-config",
   "swiftlint": "@ionic/swiftlint-config",
@@ -81,5 +81,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6e94aa5bf785e957d0cfac83b62b5355bcf7d1ed"
+  "gitHead": "023f53b42a81049b7cdef6c7b0102b85b4df1c01"
 }