@capawesome/capacitor-screenshot 6.0.0 → 7.0.0

package/CapawesomeCapacitorScreenshot.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |s|
   s.author = package['author']
   s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
   s.source_files = 'ios/Plugin/**/*.{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

@@ -0,0 +1,28 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "CapawesomeCapacitorScreenshot",
+    platforms: [.iOS(.v14)],
+    products: [
+        .library(
+            name: "CapawesomeCapacitorScreenshot",
+            targets: ["ScreenshotPlugin"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
+    ],
+    targets: [
+        .target(
+            name: "ScreenshotPlugin",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor-swift-pm"),
+                .product(name: "Cordova", package: "capacitor-swift-pm")
+            ],
+            path: "ios/Sources/ScreenshotPlugin"),
+        .testTarget(
+            name: "ScreenshotPluginTests",
+            dependencies: ["ScreenshotPlugin"],
+            path: "ios/Tests/ScreenshotPluginTests")
+    ]
+)

package/android/build.gradle

@@ -1,8 +1,8 @@
 ext {
     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'
+    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'
 }
 
 buildscript {
@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
     }
 }
 
@@ -19,10 +19,10 @@ apply plugin: 'com.android.library'
 
 android {
     namespace "io.capawesome.capacitorjs.plugins.screenshot"
-    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"
@@ -37,8 +37,8 @@ android {
         abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
 

package/dist/plugin.cjs.js

@@ -1,21 +1,15 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var core = require('@capacitor/core');
 var html2canvas = require('html2canvas');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var html2canvas__default = /*#__PURE__*/_interopDefaultLegacy(html2canvas);
-
 const Screenshot = core.registerPlugin('Screenshot', {
     web: () => Promise.resolve().then(function () { return web; }).then(m => new m.ScreenshotWeb()),
 });
 
 class ScreenshotWeb extends core.WebPlugin {
     async take() {
-        const canvas = await html2canvas__default["default"](document.body);
+        const canvas = await html2canvas(document.body);
         return { uri: canvas.toDataURL() };
     }
 }

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 Screenshot = registerPlugin('Screenshot', {\n    web: () => import('./web').then(m => new m.ScreenshotWeb()),\n});\nexport * from './definitions';\nexport { Screenshot };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nimport html2canvas from 'html2canvas';\nexport class ScreenshotWeb extends WebPlugin {\n    async take() {\n        const canvas = await html2canvas(document.body);\n        return { uri: canvas.toDataURL() };\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin","html2canvas"],"mappings":";;;;;;;;;;;AACK,MAAC,UAAU,GAAGA,mBAAc,CAAC,YAAY,EAAE;AAChD,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;AAC/D,CAAC;;ACDM,MAAM,aAAa,SAASC,cAAS,CAAC;AAC7C,IAAI,MAAM,IAAI,GAAG;AACjB,QAAQ,MAAM,MAAM,GAAG,MAAMC,+BAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACxD,QAAQ,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;AAC3C,KAAK;AACL;;;;;;;;;"}
+{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst Screenshot = registerPlugin('Screenshot', {\n    web: () => import('./web').then(m => new m.ScreenshotWeb()),\n});\nexport * from './definitions';\nexport { Screenshot };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nimport html2canvas from 'html2canvas';\nexport class ScreenshotWeb extends WebPlugin {\n    async take() {\n        const canvas = await html2canvas(document.body);\n        return { uri: canvas.toDataURL() };\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;;;AACK,MAAC,UAAU,GAAGA,mBAAc,CAAC,YAAY,EAAE;AAChD,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;AAC/D,CAAC;;ACDM,MAAM,aAAa,SAASC,cAAS,CAAC;AAC7C,IAAI,MAAM,IAAI,GAAG;AACjB,QAAQ,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;AACvD,QAAQ,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE;AAC1C;AACA;;;;;;;;;"}

package/dist/plugin.js

@@ -1,17 +1,13 @@
 var capacitorScreenshot = (function (exports, core, html2canvas) {
     'use strict';
 
-    function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-    var html2canvas__default = /*#__PURE__*/_interopDefaultLegacy(html2canvas);
-
     const Screenshot = core.registerPlugin('Screenshot', {
         web: () => Promise.resolve().then(function () { return web; }).then(m => new m.ScreenshotWeb()),
     });
 
     class ScreenshotWeb extends core.WebPlugin {
         async take() {
-            const canvas = await html2canvas__default["default"](document.body);
+            const canvas = await html2canvas(document.body);
             return { uri: canvas.toDataURL() };
         }
     }
@@ -23,8 +19,6 @@ var capacitorScreenshot = (function (exports, core, html2canvas) {
 
     exports.Screenshot = Screenshot;
 
-    Object.defineProperty(exports, '__esModule', { value: true });
-
     return exports;
 
 })({}, capacitorExports, html2canvas);

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 Screenshot = registerPlugin('Screenshot', {\n    web: () => import('./web').then(m => new m.ScreenshotWeb()),\n});\nexport * from './definitions';\nexport { Screenshot };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nimport html2canvas from 'html2canvas';\nexport class ScreenshotWeb extends WebPlugin {\n    async take() {\n        const canvas = await html2canvas(document.body);\n        return { uri: canvas.toDataURL() };\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin","html2canvas"],"mappings":";;;;;;;AACK,UAAC,UAAU,GAAGA,mBAAc,CAAC,YAAY,EAAE;IAChD,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;IAC/D,CAAC;;ICDM,MAAM,aAAa,SAASC,cAAS,CAAC;IAC7C,IAAI,MAAM,IAAI,GAAG;IACjB,QAAQ,MAAM,MAAM,GAAG,MAAMC,+BAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxD,QAAQ,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC;IAC3C,KAAK;IACL;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst Screenshot = registerPlugin('Screenshot', {\n    web: () => import('./web').then(m => new m.ScreenshotWeb()),\n});\nexport * from './definitions';\nexport { Screenshot };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nimport html2canvas from 'html2canvas';\nexport class ScreenshotWeb extends WebPlugin {\n    async take() {\n        const canvas = await html2canvas(document.body);\n        return { uri: canvas.toDataURL() };\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;AACK,UAAC,UAAU,GAAGA,mBAAc,CAAC,YAAY,EAAE;IAChD,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;IAC/D,CAAC;;ICDM,MAAM,aAAa,SAASC,cAAS,CAAC;IAC7C,IAAI,MAAM,IAAI,GAAG;IACjB,QAAQ,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC;IACvD,QAAQ,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE;IAC1C;IACA;;;;;;;;;;;;;;;"}

package/ios/Plugin/Screenshot.swift

@@ -21,7 +21,7 @@ import WebKit
                 if let error = error {
                     completion(nil, error)
                 }
-                
+
                 if let image, let imageData = image.jpegData(compressionQuality: 1.0) {
                     let filename = UUID().uuidString + ".jpg"
                     guard let cacheDirectory = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first else {

package/ios/Plugin/ScreenshotPlugin.swift

@@ -6,7 +6,12 @@ import Capacitor
  * here: https://capacitorjs.com/docs/plugins/ios
  */
 @objc(ScreenshotPlugin)
-public class ScreenshotPlugin: CAPPlugin {
+public class ScreenshotPlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "ScreenshotPlugin"
+    public let jsName = "Screenshot"
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "take", returnType: CAPPluginReturnPromise)
+    ]
     public let tag = "Screenshot"
     private var implementation: Screenshot?
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/capacitor-screenshot",
-  "version": "6.0.0",
+  "version": "7.0.0",
   "description": "Capacitor plugin for taking screenshots.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -11,7 +11,8 @@
     "android/build.gradle",
     "dist/",
     "ios/Plugin/",
-    "CapawesomeCapacitorScreenshot.podspec"
+    "CapawesomeCapacitorScreenshot.podspec",
+    "Package.swift"
   ],
   "author": "Robin Genz <mail@robingenz.dev>",
   "license": "MIT",
@@ -53,31 +54,32 @@
     "prettier": "prettier \"**/*.{css,html,ts,js,java}\"",
     "swiftlint": "node-swiftlint",
     "docgen": "docgen --api ScreenshotPlugin --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",
     "ios:pod:install": "cd ios && pod install --repo-update && cd ..",
+    "ios:spm:install": "cd ios && swift package resolve && cd ..",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {
-    "@capacitor/android": "6.0.0",
-    "@capacitor/cli": "6.0.0",
-    "@capacitor/core": "6.0.0",
-    "@capacitor/docgen": "0.2.0",
-    "@capacitor/ios": "6.0.0",
-    "@ionic/eslint-config": "0.3.0",
-    "@ionic/swiftlint-config": "1.1.2",
-    "eslint": "7.32.0",
+    "@capacitor/android": "7.0.0",
+    "@capacitor/cli": "7.0.0",
+    "@capacitor/core": "7.0.0",
+    "@capacitor/docgen": "0.3.0",
+    "@capacitor/ios": "7.0.0",
+    "@ionic/eslint-config": "0.4.0",
+    "@ionic/swiftlint-config": "2.0.0",
+    "eslint": "8.57.0",
     "html2canvas": "1.4.1",
-    "prettier": "2.3.2",
-    "prettier-plugin-java": "1.0.2",
-    "rimraf": "3.0.2",
-    "rollup": "2.77.2",
-    "swiftlint": "1.0.1",
+    "prettier": "3.4.2",
+    "prettier-plugin-java": "2.6.7",
+    "rimraf": "6.0.1",
+    "rollup": "4.30.1",
+    "swiftlint": "2.0.0",
     "typescript": "4.1.5"
   },
   "peerDependencies": {
-    "@capacitor/core": "^6.0.0",
+    "@capacitor/core": ">=7.0.0",
     "html2canvas": "^1.4.1"
   },
   "swiftlint": "@ionic/swiftlint-config",

package/ios/Plugin/ScreenshotPlugin.h

@@ -1,10 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for Plugin.
-FOUNDATION_EXPORT double PluginVersionNumber;
-
-//! Project version string for Plugin.
-FOUNDATION_EXPORT const unsigned char PluginVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <Plugin/PublicHeader.h>
-

package/ios/Plugin/ScreenshotPlugin.m

@@ -1,8 +0,0 @@
-#import <Foundation/Foundation.h>
-#import <Capacitor/Capacitor.h>
-
-// Define the plugin using the CAP_PLUGIN Macro, and
-// each method the plugin supports using the CAP_PLUGIN_METHOD macro.
-CAP_PLUGIN(ScreenshotPlugin, "Screenshot",
-           CAP_PLUGIN_METHOD(take, CAPPluginReturnPromise);
-)