diff --git a/.gitignore b/.gitignore index 2194675b2..c0599f791 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ node_modules .DS_Store package-lock.json Podfile.lock -.env \ No newline at end of file +Package.resolved +.env diff --git a/action-sheet/.gitignore b/action-sheet/.gitignore index ff42b3f48..681763795 100644 --- a/action-sheet/.gitignore +++ b/action-sheet/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/action-sheet/Package.resolved b/action-sheet/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/action-sheet/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/action-sheet/Package.swift b/action-sheet/Package.swift index 075f77633..7aaab2506 100644 --- a/action-sheet/Package.swift +++ b/action-sheet/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ActionSheetPlugin", + name: "CapacitorActionSheet", targets: ["ActionSheetPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "ActionSheetPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/ActionSheetPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["ActionSheetPlugin"], path: "ios/Tests/ActionSheetPluginTests") ] -) \ No newline at end of file +) diff --git a/app-launcher/.gitignore b/app-launcher/.gitignore index ff42b3f48..681763795 100644 --- a/app-launcher/.gitignore +++ b/app-launcher/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/app-launcher/Package.resolved b/app-launcher/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/app-launcher/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/app-launcher/Package.swift b/app-launcher/Package.swift index 509eef610..e0e9aa107 100644 --- a/app-launcher/Package.swift +++ b/app-launcher/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "AppLauncherPlugin", + name: "CapacitorAppLauncher", targets: ["AppLauncherPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "AppLauncherPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/AppLauncherPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["AppLauncherPlugin"], path: "ios/Tests/AppLauncherPluginTests") ] -) \ No newline at end of file +) diff --git a/app/.gitignore b/app/.gitignore index 420011878..df9f0c202 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/app/Package.resolved b/app/Package.resolved deleted file mode 100644 index d27db8ab9..000000000 --- a/app/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "a486602d573c65b717d0a3de0035cd879caad30d" - } - } - ], - "version" : 2 -} diff --git a/app/Package.swift b/app/Package.swift index 1e619cc7d..0b7e7db93 100644 --- a/app/Package.swift +++ b/app/Package.swift @@ -2,22 +2,22 @@ import PackageDescription let package = Package( - name: "CapacitorAppPlugin", + name: "CapacitorApp", platforms: [.iOS(.v13)], products: [ .library( - name: "AppPlugin", + name: "CapacitorApp", targets: ["AppPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "AppPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/AppPlugin"), .testTarget( diff --git a/app/package.json b/app/package.json index 11f7119e8..f3e23b059 100644 --- a/app/package.json +++ b/app/package.json @@ -31,7 +31,7 @@ ], "scripts": { "verify": "npm run verify:ios && npm run verify:android && npm run verify:web", - "verify:ios": "xcodebuild build -scheme CapacitorAppPlugin -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'", + "verify:ios": "xcodebuild build -scheme CapacitorApp -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'", "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", diff --git a/browser/.gitignore b/browser/.gitignore index ff42b3f48..681763795 100644 --- a/browser/.gitignore +++ b/browser/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/browser/Package.resolved b/browser/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/browser/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/browser/Package.swift b/browser/Package.swift index b16c98a30..3592fcd9a 100644 --- a/browser/Package.swift +++ b/browser/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "BrowserPlugin", + name: "CapacitorBrowser", targets: ["BrowserPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "BrowserPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/BrowserPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["BrowserPlugin"], path: "ios/Tests/BrowserPluginTests") ] -) \ No newline at end of file +) diff --git a/camera/.gitignore b/camera/.gitignore index ff42b3f48..681763795 100644 --- a/camera/.gitignore +++ b/camera/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/camera/Package.resolved b/camera/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/camera/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/camera/Package.swift b/camera/Package.swift index 141a5e424..a061218b1 100644 --- a/camera/Package.swift +++ b/camera/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "CameraPlugin", + name: "CapacitorCamera", targets: ["CameraPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "CameraPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/CameraPlugin"), .testTarget( diff --git a/clipboard/.gitignore b/clipboard/.gitignore index a5599e950..6403a15cc 100644 --- a/clipboard/.gitignore +++ b/clipboard/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/clipboard/Package.resolved b/clipboard/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/clipboard/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/clipboard/Package.swift b/clipboard/Package.swift index bf6730914..f01303738 100644 --- a/clipboard/Package.swift +++ b/clipboard/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ClipboardPlugin", + name: "CapacitorClipboard", targets: ["ClipboardPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "ClipboardPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/ClipboardPlugin"), .testTarget( diff --git a/device/.gitignore b/device/.gitignore index ff42b3f48..681763795 100644 --- a/device/.gitignore +++ b/device/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/device/Package.resolved b/device/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/device/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/device/Package.swift b/device/Package.swift index e3a2d36b4..ef9e4c05e 100644 --- a/device/Package.swift +++ b/device/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "DevicePlugin", + name: "CapacitorDevice", targets: ["DevicePlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "DevicePlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/DevicePlugin"), .testTarget( diff --git a/dialog/.gitignore b/dialog/.gitignore index ff42b3f48..681763795 100644 --- a/dialog/.gitignore +++ b/dialog/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/dialog/Package.resolved b/dialog/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/dialog/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/dialog/Package.swift b/dialog/Package.swift index 1af69f03a..59930ae43 100644 --- a/dialog/Package.swift +++ b/dialog/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "DialogPlugin", + name: "CapacitorDialog", targets: ["DialogPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "DialogPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/DialogPlugin"), .testTarget( diff --git a/filesystem/.gitignore b/filesystem/.gitignore index ff42b3f48..681763795 100644 --- a/filesystem/.gitignore +++ b/filesystem/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/filesystem/Package.resolved b/filesystem/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/filesystem/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/filesystem/Package.swift b/filesystem/Package.swift index 151aae957..b9b0def86 100644 --- a/filesystem/Package.swift +++ b/filesystem/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "FilesystemPlugin", + name: "CapacitorFilesystem", targets: ["FilesystemPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "FilesystemPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/FilesystemPlugin"), .testTarget( diff --git a/geolocation/.gitignore b/geolocation/.gitignore index ff42b3f48..681763795 100644 --- a/geolocation/.gitignore +++ b/geolocation/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/geolocation/Package.resolved b/geolocation/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/geolocation/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/geolocation/Package.swift b/geolocation/Package.swift index 84317212f..5994f2bd8 100644 --- a/geolocation/Package.swift +++ b/geolocation/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "GeolocationPlugin", + name: "CapacitorGeolocation", targets: ["GeolocationPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "GeolocationPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/GeolocationPlugin"), .testTarget( diff --git a/haptics/.gitignore b/haptics/.gitignore index 420011878..df9f0c202 100644 --- a/haptics/.gitignore +++ b/haptics/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/haptics/Package.resolved b/haptics/Package.resolved deleted file mode 100644 index d27db8ab9..000000000 --- a/haptics/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "a486602d573c65b717d0a3de0035cd879caad30d" - } - } - ], - "version" : 2 -} diff --git a/haptics/Package.swift b/haptics/Package.swift index e4a5e7df9..f88db0db3 100644 --- a/haptics/Package.swift +++ b/haptics/Package.swift @@ -2,22 +2,22 @@ import PackageDescription let package = Package( - name: "CapacitorHapticsPlugin", + name: "CapacitorHaptics", platforms: [.iOS(.v13)], products: [ .library( - name: "HapticsPlugin", + name: "CapacitorHaptics", targets: ["HapticsPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "HapticsPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/HapticsPlugin"), .testTarget( diff --git a/haptics/package.json b/haptics/package.json index bf012cf83..b1d818746 100644 --- a/haptics/package.json +++ b/haptics/package.json @@ -31,7 +31,7 @@ ], "scripts": { "verify": "npm run verify:ios && npm run verify:android && npm run verify:web", - "verify:ios": "xcodebuild build -scheme CapacitorHapticsPlugin -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'", + "verify:ios": "xcodebuild build -scheme CapacitorHaptics -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'", "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", diff --git a/keyboard/.gitignore b/keyboard/.gitignore index ff42b3f48..681763795 100644 --- a/keyboard/.gitignore +++ b/keyboard/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/keyboard/Package.resolved b/keyboard/Package.resolved deleted file mode 100644 index d27db8ab9..000000000 --- a/keyboard/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "a486602d573c65b717d0a3de0035cd879caad30d" - } - } - ], - "version" : 2 -} diff --git a/keyboard/Package.swift b/keyboard/Package.swift index 5e30b2f2b..b9ee31cfe 100644 --- a/keyboard/Package.swift +++ b/keyboard/Package.swift @@ -3,22 +3,22 @@ import PackageDescription let package = Package( - name: "CapacitorKeyboardPlugin", + name: "CapacitorKeyboard", platforms: [.iOS(.v13)], products: [ .library( - name: "KeyboardPlugin", + name: "CapacitorKeyboard", targets: ["KeyboardPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "KeyboardPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test")], + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm")], path: "ios/Sources/KeyboardPlugin", publicHeadersPath: "include"), .testTarget( diff --git a/keyboard/package.json b/keyboard/package.json index ad525b1e9..bd59fc185 100644 --- a/keyboard/package.json +++ b/keyboard/package.json @@ -31,7 +31,7 @@ ], "scripts": { "verify": "npm run verify:ios && npm run verify:android && npm run verify:web", - "verify:ios": "xcodebuild build -scheme CapacitorKeyboardPlugin -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'", + "verify:ios": "xcodebuild build -scheme CapacitorKeyboard -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'", "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", diff --git a/local-notifications/.gitignore b/local-notifications/.gitignore index ff42b3f48..681763795 100644 --- a/local-notifications/.gitignore +++ b/local-notifications/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/local-notifications/Package.resolved b/local-notifications/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/local-notifications/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/local-notifications/Package.swift b/local-notifications/Package.swift index 9be9b17e8..294eb1f24 100644 --- a/local-notifications/Package.swift +++ b/local-notifications/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "LocalNotificationsPlugin", + name: "CapacitorLocalNotifications", targets: ["LocalNotificationsPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "LocalNotificationsPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/LocalNotificationsPlugin"), .testTarget( diff --git a/motion/.gitignore b/motion/.gitignore index 70ccbf713..c7113c45a 100644 --- a/motion/.gitignore +++ b/motion/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata diff --git a/network/.gitignore b/network/.gitignore index ff42b3f48..681763795 100644 --- a/network/.gitignore +++ b/network/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/network/Package.resolved b/network/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/network/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/network/Package.swift b/network/Package.swift index 25026b367..8b13aab16 100644 --- a/network/Package.swift +++ b/network/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "CAPNetworkPlugin", + name: "CapacitorNetwork", targets: ["CAPNetworkPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "CAPNetworkPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/NetworkPlugin"), .testTarget( diff --git a/preferences/.gitignore b/preferences/.gitignore index 4da8a828b..3052ff620 100644 --- a/preferences/.gitignore +++ b/preferences/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/preferences/Package.resolved b/preferences/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/preferences/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/preferences/Package.swift b/preferences/Package.swift index 71a506d10..6d63445f5 100644 --- a/preferences/Package.swift +++ b/preferences/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "PreferencesPlugin", + name: "CapacitorPreferences", targets: ["PreferencesPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "PreferencesPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/PreferencesPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["PreferencesPlugin"], path: "ios/Tests/PreferencesPluginTests") ] -) \ No newline at end of file +) diff --git a/push-notifications/.gitignore b/push-notifications/.gitignore index 4da8a828b..3052ff620 100644 --- a/push-notifications/.gitignore +++ b/push-notifications/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/push-notifications/Package.resolved b/push-notifications/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/push-notifications/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/push-notifications/Package.swift b/push-notifications/Package.swift index 820d9a7d8..05313141b 100644 --- a/push-notifications/Package.swift +++ b/push-notifications/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "PushNotificationsPlugin", + name: "CapacitorPushNotifications", targets: ["PushNotificationsPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "PushNotificationsPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/PushNotificationsPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["PushNotificationsPlugin"], path: "ios/Tests/PushNotificationsPluginTests") ] -) \ No newline at end of file +) diff --git a/screen-orientation/.gitignore b/screen-orientation/.gitignore index 472139b09..4769281a0 100644 --- a/screen-orientation/.gitignore +++ b/screen-orientation/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/screen-orientation/Package.resolved b/screen-orientation/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/screen-orientation/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/screen-orientation/Package.swift b/screen-orientation/Package.swift index c6dedac72..c5c548be3 100644 --- a/screen-orientation/Package.swift +++ b/screen-orientation/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ScreenOrientationPlugin", + name: "CapacitorScreenOrientation", targets: ["ScreenOrientationPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "ScreenOrientationPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/ScreenOrientationPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["ScreenOrientationPlugin"], path: "ios/Tests/ScreenOrientationPluginTests") ] -) \ No newline at end of file +) diff --git a/screen-reader/.gitignore b/screen-reader/.gitignore index 4da8a828b..3052ff620 100644 --- a/screen-reader/.gitignore +++ b/screen-reader/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/screen-reader/Package.resolved b/screen-reader/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/screen-reader/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/screen-reader/Package.swift b/screen-reader/Package.swift index 1934433c1..bc1c11f9c 100644 --- a/screen-reader/Package.swift +++ b/screen-reader/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ScreenReaderPlugin", + name: "CapacitorScreenReader", targets: ["ScreenReaderPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "ScreenReaderPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/ScreenReaderPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["ScreenReaderPlugin"], path: "ios/Tests/ScreenReaderPluginTests") ] -) \ No newline at end of file +) diff --git a/share/.gitignore b/share/.gitignore index ff42b3f48..681763795 100644 --- a/share/.gitignore +++ b/share/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/share/Package.resolved b/share/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/share/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/share/Package.swift b/share/Package.swift index c0e85b10c..66a8a6bd6 100644 --- a/share/Package.swift +++ b/share/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "SharePlugin", + name: "CapacitorShare", targets: ["SharePlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "SharePlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/SharePlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["SharePlugin"], path: "ios/Tests/SharePluginTests") ] -) \ No newline at end of file +) diff --git a/splash-screen/.gitignore b/splash-screen/.gitignore index ff42b3f48..681763795 100644 --- a/splash-screen/.gitignore +++ b/splash-screen/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/splash-screen/Package.resolved b/splash-screen/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/splash-screen/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/splash-screen/Package.swift b/splash-screen/Package.swift index 062e8d820..b712919c6 100644 --- a/splash-screen/Package.swift +++ b/splash-screen/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "SplashScreenPlugin", + name: "CapacitorSplashScreen", targets: ["SplashScreenPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "SplashScreenPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/SplashScreenPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["SplashScreenPlugin"], path: "ios/Tests/SplashScreenPluginTests") ] -) \ No newline at end of file +) diff --git a/status-bar/.gitignore b/status-bar/.gitignore index ff42b3f48..681763795 100644 --- a/status-bar/.gitignore +++ b/status-bar/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/status-bar/Package.resolved b/status-bar/Package.resolved deleted file mode 100644 index d27db8ab9..000000000 --- a/status-bar/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "a486602d573c65b717d0a3de0035cd879caad30d" - } - } - ], - "version" : 2 -} diff --git a/status-bar/Package.swift b/status-bar/Package.swift index 72f70093c..ee22984dd 100644 --- a/status-bar/Package.swift +++ b/status-bar/Package.swift @@ -3,22 +3,22 @@ import PackageDescription let package = Package( - name: "CapacitorStatusBarPlugin", + name: "CapacitorStatusBar", platforms: [.iOS(.v13)], products: [ .library( - name: "StatusBarPlugin", + name: "CapacitorStatusBar", targets: ["StatusBarPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "StatusBarPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test")], + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm")], path: "ios/Sources/StatusBarPlugin" ), .testTarget( diff --git a/status-bar/package.json b/status-bar/package.json index 7a675a503..f6ed11e64 100644 --- a/status-bar/package.json +++ b/status-bar/package.json @@ -31,7 +31,7 @@ ], "scripts": { "verify": "npm run verify:ios && npm run verify:android && npm run verify:web", - "verify:ios": "xcodebuild build -scheme CapacitorStatusBarPlugin -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'", + "verify:ios": "xcodebuild build -scheme CapacitorStatusBar -sdk iphonesimulator17.0 -destination 'OS=17.0,name=iPhone 15'", "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", diff --git a/text-zoom/.gitignore b/text-zoom/.gitignore index ff42b3f48..681763795 100644 --- a/text-zoom/.gitignore +++ b/text-zoom/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/text-zoom/Package.resolved b/text-zoom/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/text-zoom/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/text-zoom/Package.swift b/text-zoom/Package.swift index 4b4aa854e..4f02e9379 100644 --- a/text-zoom/Package.swift +++ b/text-zoom/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "TextZoomPlugin", + name: "CapacitorTextZoom", targets: ["TextZoomPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "TextZoomPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/TextZoomPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["TextZoomPlugin"], path: "ios/Tests/TextZoomPluginTests") ] -) \ No newline at end of file +) diff --git a/toast/.gitignore b/toast/.gitignore index ff42b3f48..681763795 100644 --- a/toast/.gitignore +++ b/toast/.gitignore @@ -5,6 +5,7 @@ node_modules # iOS files Pods Podfile.lock +Package.resolved Build xcuserdata /.build diff --git a/toast/Package.resolved b/toast/Package.resolved deleted file mode 100644 index 47ee506b5..000000000 --- a/toast/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "capacitor6-spm-test", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ionic-team/capacitor6-spm-test.git", - "state" : { - "branch" : "main", - "revision" : "cf4ff2bc1dffb14adc27b1e5a09ac37e85424b99" - } - } - ], - "version" : 2 -} diff --git a/toast/Package.swift b/toast/Package.swift index 873a1bbbb..d33421ca8 100644 --- a/toast/Package.swift +++ b/toast/Package.swift @@ -6,18 +6,18 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ToastPlugin", + name: "CapacitorToast", targets: ["ToastPlugin"]) ], dependencies: [ - .package(url: "https://github.com/ionic-team/capacitor6-spm-test.git", branch: "main") + .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( name: "ToastPlugin", dependencies: [ - .product(name: "Capacitor", package: "capacitor6-spm-test"), - .product(name: "Cordova", package: "capacitor6-spm-test") + .product(name: "Capacitor", package: "capacitor-spm"), + .product(name: "Cordova", package: "capacitor-spm") ], path: "ios/Sources/ToastPlugin"), .testTarget( @@ -25,4 +25,4 @@ let package = Package( dependencies: ["ToastPlugin"], path: "ios/Tests/ToastPluginTests") ] -) \ No newline at end of file +)