chore: Update Package.swift for Cap6 release (#2041)

ionic-team · Mar 1, 2024 · 3d8bab2 · 3d8bab2
1 parent 17afbe3
commit 3d8bab2
Show file tree

Hide file tree

Showing 75 changed files with 137 additions and 434 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ node_modules
 .DS_Store
 package-lock.json
 Podfile.lock
-.env
+Package.resolved
+.env
diff --git 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
diff --git a/action-sheet/Package.swift b/action-sheet/Package.swift
@@ -6,23 +6,23 @@ 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(
             name: "ActionSheetPluginTests",
             dependencies: ["ActionSheetPlugin"],
             path: "ios/Tests/ActionSheetPluginTests")
     ]
-)
+)
diff --git 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
diff --git a/app-launcher/Package.swift b/app-launcher/Package.swift
@@ -6,23 +6,23 @@ 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(
             name: "AppLauncherPluginTests",
             dependencies: ["AppLauncherPlugin"],
             path: "ios/Tests/AppLauncherPluginTests")
     ]
-)
+)
diff --git 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
diff --git 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
@@ -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
@@ -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
diff --git a/browser/Package.swift b/browser/Package.swift
@@ -6,23 +6,23 @@ 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(
             name: "BrowserPluginTests",
             dependencies: ["BrowserPlugin"],
             path: "ios/Tests/BrowserPluginTests")
     ]
-)
+)
diff --git 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
diff --git 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
@@ -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
diff --git 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
@@ -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
diff --git 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
@@ -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