From 730bf8190eb8c21e946d33de558f143a9827aeb0 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Fri, 23 Feb 2024 12:05:22 -0500 Subject: [PATCH 01/14] chore: point Package.swift to correct place --- action-sheet/Package.swift | 8 ++++---- app-launcher/Package.swift | 8 ++++---- app/Package.swift | 6 +++--- browser/Package.swift | 8 ++++---- camera/Package.swift | 6 +++--- clipboard/Package.swift | 6 +++--- device/Package.swift | 6 +++--- dialog/Package.swift | 6 +++--- filesystem/Package.swift | 6 +++--- geolocation/Package.swift | 6 +++--- haptics/Package.swift | 6 +++--- keyboard/Package.swift | 6 +++--- local-notifications/Package.swift | 6 +++--- network/Package.swift | 6 +++--- preferences/Package.swift | 8 ++++---- push-notifications/Package.swift | 8 ++++---- screen-orientation/Package.swift | 8 ++++---- screen-reader/Package.swift | 8 ++++---- share/Package.swift | 8 ++++---- splash-screen/Package.swift | 8 ++++---- status-bar/Package.swift | 6 +++--- text-zoom/Package.swift | 8 ++++---- toast/Package.swift | 10 +++++----- 23 files changed, 81 insertions(+), 81 deletions(-) diff --git a/action-sheet/Package.swift b/action-sheet/Package.swift index 075f77633..e3d79a51d 100644 --- a/action-sheet/Package.swift +++ b/action-sheet/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/app-launcher/Package.swift index 509eef610..5a9302816 100644 --- a/app-launcher/Package.swift +++ b/app-launcher/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/app/Package.swift index 1e619cc7d..18882aff7 100644 --- a/app/Package.swift +++ b/app/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/browser/Package.swift b/browser/Package.swift index b16c98a30..ef372373f 100644 --- a/browser/Package.swift +++ b/browser/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/camera/Package.swift index 141a5e424..9bb664ffd 100644 --- a/camera/Package.swift +++ b/camera/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/clipboard/Package.swift index bf6730914..c41bde185 100644 --- a/clipboard/Package.swift +++ b/clipboard/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/device/Package.swift index e3a2d36b4..eaf5a9373 100644 --- a/device/Package.swift +++ b/device/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/dialog/Package.swift index 1af69f03a..be742c5b1 100644 --- a/dialog/Package.swift +++ b/dialog/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/filesystem/Package.swift index 151aae957..d76af9ac6 100644 --- a/filesystem/Package.swift +++ b/filesystem/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/geolocation/Package.swift index 84317212f..6c13b5000 100644 --- a/geolocation/Package.swift +++ b/geolocation/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/haptics/Package.swift index e4a5e7df9..732590b4b 100644 --- a/haptics/Package.swift +++ b/haptics/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/keyboard/Package.swift b/keyboard/Package.swift index 5e30b2f2b..efc47c866 100644 --- a/keyboard/Package.swift +++ b/keyboard/Package.swift @@ -11,14 +11,14 @@ let package = Package( 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/local-notifications/Package.swift b/local-notifications/Package.swift index 9be9b17e8..eafb77a26 100644 --- a/local-notifications/Package.swift +++ b/local-notifications/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/network/Package.swift b/network/Package.swift index 25026b367..f6d0c61b2 100644 --- a/network/Package.swift +++ b/network/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/preferences/Package.swift index 71a506d10..921042789 100644 --- a/preferences/Package.swift +++ b/preferences/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/push-notifications/Package.swift index 820d9a7d8..71b6c5f5d 100644 --- a/push-notifications/Package.swift +++ b/push-notifications/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/screen-orientation/Package.swift index c6dedac72..613e3b70c 100644 --- a/screen-orientation/Package.swift +++ b/screen-orientation/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/screen-reader/Package.swift index 1934433c1..17fe0a2d5 100644 --- a/screen-reader/Package.swift +++ b/screen-reader/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/share/Package.swift index c0e85b10c..83d1e8a77 100644 --- a/share/Package.swift +++ b/share/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/splash-screen/Package.swift index 062e8d820..ecc42be50 100644 --- a/splash-screen/Package.swift +++ b/splash-screen/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/Package.swift b/status-bar/Package.swift index 72f70093c..b7d458420 100644 --- a/status-bar/Package.swift +++ b/status-bar/Package.swift @@ -11,14 +11,14 @@ let package = Package( 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/text-zoom/Package.swift b/text-zoom/Package.swift index 4b4aa854e..9257d8a02 100644 --- a/text-zoom/Package.swift +++ b/text-zoom/Package.swift @@ -10,14 +10,14 @@ let package = Package( 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/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 +) From bc7cf632db55b575f71c4d0f7c04e02c193f3dc4 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Fri, 23 Feb 2024 12:39:53 -0500 Subject: [PATCH 02/14] chore: delete package.resolved --- app-launcher/Package.resolved | 14 -------------- app/Package.resolved | 14 -------------- browser/Package.resolved | 14 -------------- camera/Package.resolved | 14 -------------- clipboard/Package.resolved | 14 -------------- device/Package.resolved | 14 -------------- dialog/Package.resolved | 14 -------------- filesystem/Package.resolved | 14 -------------- geolocation/Package.resolved | 14 -------------- haptics/Package.resolved | 14 -------------- keyboard/Package.resolved | 14 -------------- local-notifications/Package.resolved | 14 -------------- network/Package.resolved | 14 -------------- preferences/Package.resolved | 14 -------------- push-notifications/Package.resolved | 14 -------------- screen-orientation/Package.resolved | 14 -------------- screen-reader/Package.resolved | 14 -------------- share/Package.resolved | 14 -------------- splash-screen/Package.resolved | 14 -------------- status-bar/Package.resolved | 14 -------------- text-zoom/Package.resolved | 14 -------------- toast/Package.resolved | 14 -------------- toast/Package.swift | 4 ++-- 23 files changed, 2 insertions(+), 310 deletions(-) delete mode 100644 app-launcher/Package.resolved delete mode 100644 app/Package.resolved delete mode 100644 browser/Package.resolved delete mode 100644 camera/Package.resolved delete mode 100644 clipboard/Package.resolved delete mode 100644 device/Package.resolved delete mode 100644 dialog/Package.resolved delete mode 100644 filesystem/Package.resolved delete mode 100644 geolocation/Package.resolved delete mode 100644 haptics/Package.resolved delete mode 100644 keyboard/Package.resolved delete mode 100644 local-notifications/Package.resolved delete mode 100644 network/Package.resolved delete mode 100644 preferences/Package.resolved delete mode 100644 push-notifications/Package.resolved delete mode 100644 screen-orientation/Package.resolved delete mode 100644 screen-reader/Package.resolved delete mode 100644 share/Package.resolved delete mode 100644 splash-screen/Package.resolved delete mode 100644 status-bar/Package.resolved delete mode 100644 text-zoom/Package.resolved delete mode 100644 toast/Package.resolved 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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-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/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/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/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/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/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 d33421ca8..499e9231a 100644 --- a/toast/Package.swift +++ b/toast/Package.swift @@ -7,14 +7,14 @@ let package = Package( products: [ .library( name: "CapacitorToast", - targets: ["ToastPlugin"]) + targets: ["CapacitorToast"]) ], dependencies: [ .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( - name: "ToastPlugin", + name: "CapacitorToast", dependencies: [ .product(name: "Capacitor", package: "capacitor-spm"), .product(name: "Cordova", package: "capacitor-spm") From 500c6061177585aa14b00afbf4a1c7d5b06f2a47 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Fri, 23 Feb 2024 12:41:09 -0500 Subject: [PATCH 03/14] chore: update gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 60fc7fc9f860b9444a28e0046e835f8c26089dd8 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Fri, 23 Feb 2024 12:46:22 -0500 Subject: [PATCH 04/14] chore: add Package.resolved to gitignores --- action-sheet/.gitignore | 1 + app-launcher/.gitignore | 1 + app/.gitignore | 1 + browser/.gitignore | 1 + camera/.gitignore | 1 + clipboard/.gitignore | 1 + device/.gitignore | 1 + dialog/.gitignore | 1 + filesystem/.gitignore | 1 + geolocation/.gitignore | 1 + haptics/.gitignore | 1 + keyboard/.gitignore | 1 + local-notifications/.gitignore | 1 + motion/.gitignore | 1 + network/.gitignore | 1 + preferences/.gitignore | 1 + push-notifications/.gitignore | 1 + screen-orientation/.gitignore | 1 + screen-reader/.gitignore | 1 + share/.gitignore | 1 + splash-screen/.gitignore | 1 + status-bar/.gitignore | 1 + text-zoom/.gitignore | 1 + toast/.gitignore | 1 + 24 files changed, 24 insertions(+) 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/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/.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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-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/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/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/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/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/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 From 3aee56805ba5638388bb7f080ff3df7316ee6a43 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Fri, 23 Feb 2024 12:51:25 -0500 Subject: [PATCH 05/14] action-sheet update --- action-sheet/Package.resolved | 14 -------------- action-sheet/Package.swift | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 action-sheet/Package.resolved 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 e3d79a51d..7aaab2506 100644 --- a/action-sheet/Package.swift +++ b/action-sheet/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ActionSheetPlugin", + name: "CapacitorActionSheet", targets: ["ActionSheetPlugin"]) ], dependencies: [ From bdac4b291c9d5323ebe51b2972fc0c02726a68f0 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Tue, 27 Feb 2024 14:04:03 -0500 Subject: [PATCH 06/14] Change names in Package.swift to fix SPM cli --- app-launcher/Package.swift | 2 +- app/Package.swift | 2 +- browser/Package.swift | 2 +- camera/Package.swift | 2 +- clipboard/Package.swift | 2 +- device/Package.swift | 2 +- dialog/Package.swift | 2 +- filesystem/Package.swift | 2 +- haptics/Package.swift | 2 +- keyboard/Package.swift | 2 +- local-notifications/Package.swift | 2 +- network/Package.swift | 2 +- push-notifications/Package.swift | 2 +- screen-orientation/Package.swift | 2 +- screen-reader/Package.swift | 2 +- share/Package.swift | 2 +- splash-screen/Package.swift | 2 +- status-bar/Package.swift | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app-launcher/Package.swift b/app-launcher/Package.swift index 5a9302816..e0e9aa107 100644 --- a/app-launcher/Package.swift +++ b/app-launcher/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "AppLauncherPlugin", + name: "CapacitorAppLauncher", targets: ["AppLauncherPlugin"]) ], dependencies: [ diff --git a/app/Package.swift b/app/Package.swift index 18882aff7..aefc22d2a 100644 --- a/app/Package.swift +++ b/app/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "AppPlugin", + name: "CapacitorAppPlugin", targets: ["AppPlugin"]) ], dependencies: [ diff --git a/browser/Package.swift b/browser/Package.swift index ef372373f..3592fcd9a 100644 --- a/browser/Package.swift +++ b/browser/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "BrowserPlugin", + name: "CapacitorBrowser", targets: ["BrowserPlugin"]) ], dependencies: [ diff --git a/camera/Package.swift b/camera/Package.swift index 9bb664ffd..a061218b1 100644 --- a/camera/Package.swift +++ b/camera/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "CameraPlugin", + name: "CapacitorCamera", targets: ["CameraPlugin"]) ], dependencies: [ diff --git a/clipboard/Package.swift b/clipboard/Package.swift index c41bde185..f01303738 100644 --- a/clipboard/Package.swift +++ b/clipboard/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ClipboardPlugin", + name: "CapacitorClipboard", targets: ["ClipboardPlugin"]) ], dependencies: [ diff --git a/device/Package.swift b/device/Package.swift index eaf5a9373..ef9e4c05e 100644 --- a/device/Package.swift +++ b/device/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "DevicePlugin", + name: "CapacitorDevice", targets: ["DevicePlugin"]) ], dependencies: [ diff --git a/dialog/Package.swift b/dialog/Package.swift index be742c5b1..59930ae43 100644 --- a/dialog/Package.swift +++ b/dialog/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "DialogPlugin", + name: "CapacitorDialog", targets: ["DialogPlugin"]) ], dependencies: [ diff --git a/filesystem/Package.swift b/filesystem/Package.swift index d76af9ac6..b9b0def86 100644 --- a/filesystem/Package.swift +++ b/filesystem/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "FilesystemPlugin", + name: "CapacitorFilesystem", targets: ["FilesystemPlugin"]) ], dependencies: [ diff --git a/haptics/Package.swift b/haptics/Package.swift index 732590b4b..1fc3b3181 100644 --- a/haptics/Package.swift +++ b/haptics/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "HapticsPlugin", + name: "CapacitorHapticsPlugin", targets: ["HapticsPlugin"]) ], dependencies: [ diff --git a/keyboard/Package.swift b/keyboard/Package.swift index efc47c866..ebda03d71 100644 --- a/keyboard/Package.swift +++ b/keyboard/Package.swift @@ -7,7 +7,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "KeyboardPlugin", + name: "CapacitorKeyboardPlugin", targets: ["KeyboardPlugin"]) ], dependencies: [ diff --git a/local-notifications/Package.swift b/local-notifications/Package.swift index eafb77a26..294eb1f24 100644 --- a/local-notifications/Package.swift +++ b/local-notifications/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "LocalNotificationsPlugin", + name: "CapacitorLocalNotifications", targets: ["LocalNotificationsPlugin"]) ], dependencies: [ diff --git a/network/Package.swift b/network/Package.swift index f6d0c61b2..8b13aab16 100644 --- a/network/Package.swift +++ b/network/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "CAPNetworkPlugin", + name: "CapacitorNetwork", targets: ["CAPNetworkPlugin"]) ], dependencies: [ diff --git a/push-notifications/Package.swift b/push-notifications/Package.swift index 71b6c5f5d..05313141b 100644 --- a/push-notifications/Package.swift +++ b/push-notifications/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "PushNotificationsPlugin", + name: "CapacitorPushNotifications", targets: ["PushNotificationsPlugin"]) ], dependencies: [ diff --git a/screen-orientation/Package.swift b/screen-orientation/Package.swift index 613e3b70c..c5c548be3 100644 --- a/screen-orientation/Package.swift +++ b/screen-orientation/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ScreenOrientationPlugin", + name: "CapacitorScreenOrientation", targets: ["ScreenOrientationPlugin"]) ], dependencies: [ diff --git a/screen-reader/Package.swift b/screen-reader/Package.swift index 17fe0a2d5..bc1c11f9c 100644 --- a/screen-reader/Package.swift +++ b/screen-reader/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "ScreenReaderPlugin", + name: "CapacitorScreenReader", targets: ["ScreenReaderPlugin"]) ], dependencies: [ diff --git a/share/Package.swift b/share/Package.swift index 83d1e8a77..66a8a6bd6 100644 --- a/share/Package.swift +++ b/share/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "SharePlugin", + name: "CapacitorShare", targets: ["SharePlugin"]) ], dependencies: [ diff --git a/splash-screen/Package.swift b/splash-screen/Package.swift index ecc42be50..b712919c6 100644 --- a/splash-screen/Package.swift +++ b/splash-screen/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "SplashScreenPlugin", + name: "CapacitorSplashScreen", targets: ["SplashScreenPlugin"]) ], dependencies: [ diff --git a/status-bar/Package.swift b/status-bar/Package.swift index b7d458420..ef547b8fa 100644 --- a/status-bar/Package.swift +++ b/status-bar/Package.swift @@ -7,7 +7,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "StatusBarPlugin", + name: "CapacitorStatusBarPlugin", targets: ["StatusBarPlugin"]) ], dependencies: [ From 8ccf2c5205e0b3d9bd4c435d4fc448a4f1f5d4d8 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Tue, 27 Feb 2024 14:14:04 -0500 Subject: [PATCH 07/14] chore: fix toast compilation --- toast/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toast/Package.swift b/toast/Package.swift index 499e9231a..d33421ca8 100644 --- a/toast/Package.swift +++ b/toast/Package.swift @@ -7,14 +7,14 @@ let package = Package( products: [ .library( name: "CapacitorToast", - targets: ["CapacitorToast"]) + targets: ["ToastPlugin"]) ], dependencies: [ .package(url: "https://github.com/ionic-team/capacitor-spm.git", branch: "main") ], targets: [ .target( - name: "CapacitorToast", + name: "ToastPlugin", dependencies: [ .product(name: "Capacitor", package: "capacitor-spm"), .product(name: "Cordova", package: "capacitor-spm") From 1ba9b213c9506dbe2772e1e05085f2eff0ffbd2c Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Tue, 27 Feb 2024 14:26:15 -0500 Subject: [PATCH 08/14] chore: commit some missed files --- geolocation/Package.swift | 2 +- preferences/Package.swift | 2 +- text-zoom/Package.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/geolocation/Package.swift b/geolocation/Package.swift index 6c13b5000..5994f2bd8 100644 --- a/geolocation/Package.swift +++ b/geolocation/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "GeolocationPlugin", + name: "CapacitorGeolocation", targets: ["GeolocationPlugin"]) ], dependencies: [ diff --git a/preferences/Package.swift b/preferences/Package.swift index 921042789..6d63445f5 100644 --- a/preferences/Package.swift +++ b/preferences/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "PreferencesPlugin", + name: "CapacitorPreferences", targets: ["PreferencesPlugin"]) ], dependencies: [ diff --git a/text-zoom/Package.swift b/text-zoom/Package.swift index 9257d8a02..4f02e9379 100644 --- a/text-zoom/Package.swift +++ b/text-zoom/Package.swift @@ -6,7 +6,7 @@ let package = Package( platforms: [.iOS(.v13)], products: [ .library( - name: "TextZoomPlugin", + name: "CapacitorTextZoom", targets: ["TextZoomPlugin"]) ], dependencies: [ From 7695b7812abcb97d543e0e62425123aaf02f6311 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Tue, 27 Feb 2024 15:37:35 -0500 Subject: [PATCH 09/14] fix app Package.swift name --- app/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Package.swift b/app/Package.swift index aefc22d2a..0b7e7db93 100644 --- a/app/Package.swift +++ b/app/Package.swift @@ -2,11 +2,11 @@ import PackageDescription let package = Package( - name: "CapacitorAppPlugin", + name: "CapacitorApp", platforms: [.iOS(.v13)], products: [ .library( - name: "CapacitorAppPlugin", + name: "CapacitorApp", targets: ["AppPlugin"]) ], dependencies: [ From ae42c15bd862581c991ffa641a9ba808b17ea9aa Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Tue, 27 Feb 2024 15:45:31 -0500 Subject: [PATCH 10/14] fix Haptics plugin name --- haptics/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haptics/Package.swift b/haptics/Package.swift index 1fc3b3181..f88db0db3 100644 --- a/haptics/Package.swift +++ b/haptics/Package.swift @@ -2,11 +2,11 @@ import PackageDescription let package = Package( - name: "CapacitorHapticsPlugin", + name: "CapacitorHaptics", platforms: [.iOS(.v13)], products: [ .library( - name: "CapacitorHapticsPlugin", + name: "CapacitorHaptics", targets: ["HapticsPlugin"]) ], dependencies: [ From d482c36cca671e518f291803fa7c7729fccbc811 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Tue, 27 Feb 2024 16:02:46 -0500 Subject: [PATCH 11/14] Fix package.json for building --- app/package.json | 2 +- haptics/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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", From 320ae1b760136fd3f2d6d8098715087ed6724a5c Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Thu, 29 Feb 2024 13:06:16 -0500 Subject: [PATCH 12/14] Fix CapacitorStatusBar Names --- status-bar/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/status-bar/Package.swift b/status-bar/Package.swift index ef547b8fa..ee22984dd 100644 --- a/status-bar/Package.swift +++ b/status-bar/Package.swift @@ -3,11 +3,11 @@ import PackageDescription let package = Package( - name: "CapacitorStatusBarPlugin", + name: "CapacitorStatusBar", platforms: [.iOS(.v13)], products: [ .library( - name: "CapacitorStatusBarPlugin", + name: "CapacitorStatusBar", targets: ["StatusBarPlugin"]) ], dependencies: [ From 2269550f514d89a00c0fd2461177d53e9bd9444e Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Thu, 29 Feb 2024 13:07:16 -0500 Subject: [PATCH 13/14] Fix CapactiorKeyboard plugin name --- keyboard/Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboard/Package.swift b/keyboard/Package.swift index ebda03d71..b9ee31cfe 100644 --- a/keyboard/Package.swift +++ b/keyboard/Package.swift @@ -3,11 +3,11 @@ import PackageDescription let package = Package( - name: "CapacitorKeyboardPlugin", + name: "CapacitorKeyboard", platforms: [.iOS(.v13)], products: [ .library( - name: "CapacitorKeyboardPlugin", + name: "CapacitorKeyboard", targets: ["KeyboardPlugin"]) ], dependencies: [ From 1d36b4bd3067923d72ff0219f70333feb8d59a12 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Thu, 29 Feb 2024 13:12:53 -0500 Subject: [PATCH 14/14] Fix compile of keyboard and status --- keyboard/package.json | 2 +- status-bar/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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",