@capacitor/device 6.0.0-alpha.2 → 6.0.0-beta.1

package/CapacitorDevice.podspec

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

package/Package.swift

@@ -0,0 +1,28 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "CapacitorDevice",
+    platforms: [.iOS(.v13)],
+    products: [
+        .library(
+            name: "DevicePlugin",
+            targets: ["DevicePlugin"])
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main")
+    ],
+    targets: [
+        .target(
+            name: "DevicePlugin",
+            dependencies: [
+                .product(name: "Capacitor", package: "capacitor6-spm-test"),
+                .product(name: "Cordova", package: "capacitor6-spm-test")
+            ],
+            path: "ios/Sources/DevicePlugin"),
+        .testTarget(
+            name: "DevicePluginTests",
+            dependencies: ["DevicePlugin"],
+            path: "ios/Tests/DevicePluginTests")
+    ]
+)

package/android/build.gradle

@@ -15,7 +15,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0-rc02'
+        classpath 'com.android.tools.build:gradle:8.2.0'
         if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
             classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'
         }

package/ios/{Plugin → Sources/DevicePlugin}/DevicePlugin.swift

@@ -2,7 +2,16 @@ import Foundation
 import Capacitor
 
 @objc(DevicePlugin)
-public class DevicePlugin: CAPPlugin {
+public class DevicePlugin: CAPPlugin, CAPBridgedPlugin {
+    public let identifier = "DevicePlugin"
+    public let jsName = "Device"
+    public let pluginMethods: [CAPPluginMethod] = [
+        CAPPluginMethod(name: "getId", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getInfo", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getBatteryInfo", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getLanguageCode", returnType: CAPPluginReturnPromise),
+        CAPPluginMethod(name: "getLanguageTag", returnType: CAPPluginReturnPromise)
+    ]
     private let implementation = Device()
 
     @objc func getId(_ call: CAPPluginCall) {

package/ios/Tests/DevicePluginTests/DevicePluginTests.swift

@@ -0,0 +1,12 @@
+import XCTest
+@testable import DevicePlugin
+
+final class DevicePluginTests: XCTestCase {
+    func testExample() throws {
+        // XCTest Documentation
+        // https://developer.apple.com/documentation/xctest
+
+        // Defining Test Cases and Test Methods
+        // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/device",
-  "version": "6.0.0-alpha.2",
+  "version": "6.0.0-beta.1",
   "description": "The Device API exposes internal information about the device, such as the model and operating system version, along with user information such as unique ids.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -10,7 +10,9 @@
     "android/src/main/",
     "android/build.gradle",
     "dist/",
-    "ios/Plugin/",
+    "ios/Sources",
+    "ios/Tests",
+    "Package.swift",
     "CapacitorDevice.podspec"
   ],
   "author": "Ionic <hi@ionicframework.com>",
@@ -30,7 +32,7 @@
   "scripts": {
     "test": "uvu -r esm -r ts-node/register src/__tests__",
     "verify": "npm run verify:ios && npm run verify:android && npm run verify:web",
-    "verify:ios": "cd ios && pod install && xcodebuild -workspace Plugin.xcworkspace -scheme Plugin -destination generic/platform=iOS && cd ..",
+    "verify:ios": "xcodebuild build -scheme CapacitorDevice -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'",
     "verify:android": "cd android && ./gradlew clean build test && cd ..",
     "verify:web": "npm run build && npm test",
     "lint": "npm run eslint && npm run prettier -- --check && npm run swiftlint -- lint",
@@ -83,5 +85,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "af95940154b4286542e776f348c58faccbf16803"
+  "gitHead": "30b23b6d07dda00b8f9b7ae0002036e2792943b4"
 }

package/ios/Plugin/DevicePlugin.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/DevicePlugin.m

@@ -1,12 +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(DevicePlugin, "Device",
-           CAP_PLUGIN_METHOD(getId, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getInfo, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getBatteryInfo, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getLanguageCode, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(getLanguageTag, CAPPluginReturnPromise);
-)

package/ios/Plugin/Info.plist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>