Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update Package.swift for Cap6 release #2041

Merged
merged 15 commits into from
Mar 1, 2024
Merged

chore: Update Package.swift for Cap6 release #2041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
730bf81
chore: point Package.swift to correct place
markemer Feb 23, 2024
bc7cf63
chore: delete package.resolved
markemer Feb 23, 2024
500c606
chore: update gitignore
markemer Feb 23, 2024
60fc7fc
chore: add Package.resolved to gitignores
markemer Feb 23, 2024
3aee568
action-sheet update
markemer Feb 23, 2024
bdac4b2
Change names in Package.swift to fix SPM cli
markemer Feb 27, 2024
8ccf2c5
chore: fix toast compilation
markemer Feb 27, 2024
1ba9b21
chore: commit some missed files
markemer Feb 27, 2024
7695b78
fix app Package.swift name
markemer Feb 27, 2024
ae42c15
fix Haptics plugin name
markemer Feb 27, 2024
d482c36
Fix package.json for building
markemer Feb 27, 2024
320ae1b
Fix CapacitorStatusBar Names
markemer Feb 29, 2024
2269550
Fix CapactiorKeyboard plugin name
markemer Feb 29, 2024
76cbe34
Merge branch 'main' into RDMR-33
markemer Feb 29, 2024
1d36b4b
Fix compile of keyboard and status
markemer Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules
.DS_Store
package-lock.json
Podfile.lock
.env
Package.resolved
.env
1 change: 1 addition & 0 deletions action-sheet/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# iOS files
Pods
Podfile.lock
Package.resolved
Build
xcuserdata
/.build
Expand Down
14 changes: 0 additions & 14 deletions action-sheet/Package.resolved
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions action-sheet/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
]
)
)
1 change: 1 addition & 0 deletions app-launcher/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# iOS files
Pods
Podfile.lock
Package.resolved
Build
xcuserdata
/.build
Expand Down
14 changes: 0 additions & 14 deletions app-launcher/Package.resolved
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions app-launcher/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
]
)
)
1 change: 1 addition & 0 deletions app/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# iOS files
Pods
Podfile.lock
Package.resolved
Build
xcuserdata
/.build
Expand Down
14 changes: 0 additions & 14 deletions app/Package.resolved
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions app/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions browser/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# iOS files
Pods
Podfile.lock
Package.resolved
Build
xcuserdata
/.build
Expand Down
14 changes: 0 additions & 14 deletions browser/Package.resolved
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions browser/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
]
)
)
1 change: 1 addition & 0 deletions camera/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# iOS files
Pods
Podfile.lock
Package.resolved
Build
xcuserdata
/.build
Expand Down
14 changes: 0 additions & 14 deletions camera/Package.resolved
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions camera/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions clipboard/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# iOS files
Pods
Podfile.lock
Package.resolved
Build
xcuserdata
/.build
Expand Down
14 changes: 0 additions & 14 deletions clipboard/Package.resolved
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions clipboard/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions device/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# iOS files
Pods
Podfile.lock
Package.resolved
Build
xcuserdata
/.build
Expand Down
14 changes: 0 additions & 14 deletions device/Package.resolved
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions device/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 1 addition & 0 deletions dialog/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ node_modules
# iOS files
Pods
Podfile.lock
Package.resolved
Build
xcuserdata
/.build
Expand Down
14 changes: 0 additions & 14 deletions dialog/Package.resolved
View file
Open in desktop

This file was deleted.

Loading
Loading