Skip to content

Commit b914775

Browse files
lucasfernoglucasfernog
authored
fix: explicitly set a minimum macOS version for older Swift versions (#1679)
ref tauri-apps/tauri#10687
1 parent 66b9eaa commit b914775

File tree

24 files changed

+246
-814
lines changed

24 files changed

+246
-814
lines changed

‎.changes/swift-build-older-versions.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
"barcode-scanner": patch
3+
"biometric": patch
4+
"clipboard-manager": patch
5+
"dialog": patch
6+
"geolocation": patch
7+
"haptics": patch
8+
"log-plugin": patch
9+
"nfc": patch
10+
"notification": patch
11+
"shell": patch
12+
"store": patch
13+
---
14+
15+
Explicitly set a minimum macOS version for the Swift package.

‎plugins/barcode-scanner/ios/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import PackageDescription
1010
let package = Package(
1111
name: "tauri-plugin-barcode-scanner",
1212
platforms: [
13-
.iOS(.v13)
13+
.macOS(.v10_13),
14+
.iOS(.v13),
1415
],
1516
products: [
1617
// Products define the executables and libraries a package produces, and make them visible to other packages.

‎plugins/biometric/ios/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import PackageDescription
88
let package = Package(
99
name: "tauri-plugin-biometric",
1010
platforms: [
11-
.iOS(.v13)
11+
.macOS(.v10_13),
12+
.iOS(.v13),
1213
],
1314
products: [
1415
// Products define the executables and libraries a package produces, and make them visible to other packages.

‎plugins/clipboard-manager/ios/Package.swift‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,29 @@
66
import PackageDescription
77

88
let package = Package(
9-
name: "tauri-plugin-clipboard-manager",
10-
platforms: [
11-
.iOS(.v13),
12-
],
13-
products: [
14-
// Products define the executables and libraries a package produces, and make them visible to other packages.
15-
.library(
16-
name: "tauri-plugin-clipboard-manager",
17-
type: .static,
18-
targets: ["tauri-plugin-clipboard-manager"]),
19-
],
20-
dependencies: [
21-
.package(name: "Tauri", path: "../.tauri/tauri-api")
22-
],
23-
targets: [
24-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
25-
// Targets can depend on other targets in this package, and on products in packages this package depends on.
26-
.target(
27-
name: "tauri-plugin-clipboard-manager",
28-
dependencies: [
29-
.byName(name: "Tauri")
30-
],
31-
path: "Sources")
32-
]
9+
name: "tauri-plugin-clipboard-manager",
10+
platforms: [
11+
.macOS(.v10_13),
12+
.iOS(.v13),
13+
],
14+
products: [
15+
// Products define the executables and libraries a package produces, and make them visible to other packages.
16+
.library(
17+
name: "tauri-plugin-clipboard-manager",
18+
type: .static,
19+
targets: ["tauri-plugin-clipboard-manager"])
20+
],
21+
dependencies: [
22+
.package(name: "Tauri", path: "../.tauri/tauri-api")
23+
],
24+
targets: [
25+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
26+
// Targets can depend on other targets in this package, and on products in packages this package depends on.
27+
.target(
28+
name: "tauri-plugin-clipboard-manager",
29+
dependencies: [
30+
.byName(name: "Tauri")
31+
],
32+
path: "Sources")
33+
]
3334
)

‎plugins/dialog/ios/Package.swift‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,29 @@
66
import PackageDescription
77

88
let package = Package(
9-
name: "tauri-plugin-dialog",
10-
platforms: [
11-
.iOS(.v13),
12-
],
13-
products: [
14-
// Products define the executables and libraries a package produces, and make them visible to other packages.
15-
.library(
16-
name: "tauri-plugin-dialog",
17-
type: .static,
18-
targets: ["tauri-plugin-dialog"]),
19-
],
20-
dependencies: [
21-
.package(name: "Tauri", path: "../.tauri/tauri-api")
22-
],
23-
targets: [
24-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
25-
// Targets can depend on other targets in this package, and on products in packages this package depends on.
26-
.target(
27-
name: "tauri-plugin-dialog",
28-
dependencies: [
29-
.byName(name: "Tauri")
30-
],
31-
path: "Sources")
32-
]
9+
name: "tauri-plugin-dialog",
10+
platforms: [
11+
.macOS(.v10_13),
12+
.iOS(.v13),
13+
],
14+
products: [
15+
// Products define the executables and libraries a package produces, and make them visible to other packages.
16+
.library(
17+
name: "tauri-plugin-dialog",
18+
type: .static,
19+
targets: ["tauri-plugin-dialog"])
20+
],
21+
dependencies: [
22+
.package(name: "Tauri", path: "../.tauri/tauri-api")
23+
],
24+
targets: [
25+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
26+
// Targets can depend on other targets in this package, and on products in packages this package depends on.
27+
.target(
28+
name: "tauri-plugin-dialog",
29+
dependencies: [
30+
.byName(name: "Tauri")
31+
],
32+
path: "Sources")
33+
]
3334
)

‎plugins/geolocation/ios/Package.swift‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,29 @@
66
import PackageDescription
77

88
let package = Package(
9-
name: "tauri-plugin-geolocation",
10-
platforms: [
11-
.iOS(.v13),
12-
],
13-
products: [
14-
// Products define the executables and libraries a package produces, and make them visible to other packages.
15-
.library(
16-
name: "tauri-plugin-geolocation",
17-
type: .static,
18-
targets: ["tauri-plugin-geolocation"]),
19-
],
20-
dependencies: [
21-
.package(name: "Tauri", path: "../.tauri/tauri-api")
22-
],
23-
targets: [
24-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
25-
// Targets can depend on other targets in this package, and on products in packages this package depends on.
26-
.target(
27-
name: "tauri-plugin-geolocation",
28-
dependencies: [
29-
.byName(name: "Tauri")
30-
],
31-
path: "Sources")
32-
]
9+
name: "tauri-plugin-geolocation",
10+
platforms: [
11+
.macOS(.v10_13),
12+
.iOS(.v13),
13+
],
14+
products: [
15+
// Products define the executables and libraries a package produces, and make them visible to other packages.
16+
.library(
17+
name: "tauri-plugin-geolocation",
18+
type: .static,
19+
targets: ["tauri-plugin-geolocation"])
20+
],
21+
dependencies: [
22+
.package(name: "Tauri", path: "../.tauri/tauri-api")
23+
],
24+
targets: [
25+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
26+
// Targets can depend on other targets in this package, and on products in packages this package depends on.
27+
.target(
28+
name: "tauri-plugin-geolocation",
29+
dependencies: [
30+
.byName(name: "Tauri")
31+
],
32+
path: "Sources")
33+
]
3334
)

‎plugins/haptics/ios/Package.swift‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,29 @@
66
import PackageDescription
77

88
let package = Package(
9-
name: "tauri-plugin-haptics",
10-
platforms: [
11-
.iOS(.v13),
12-
],
13-
products: [
14-
// Products define the executables and libraries a package produces, and make them visible to other packages.
15-
.library(
16-
name: "tauri-plugin-haptics",
17-
type: .static,
18-
targets: ["tauri-plugin-haptics"]),
19-
],
20-
dependencies: [
21-
.package(name: "Tauri", path: "../.tauri/tauri-api")
22-
],
23-
targets: [
24-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
25-
// Targets can depend on other targets in this package, and on products in packages this package depends on.
26-
.target(
27-
name: "tauri-plugin-haptics",
28-
dependencies: [
29-
.byName(name: "Tauri")
30-
],
31-
path: "Sources")
32-
]
9+
name: "tauri-plugin-haptics",
10+
platforms: [
11+
.macOS(.v10_13),
12+
.iOS(.v13),
13+
],
14+
products: [
15+
// Products define the executables and libraries a package produces, and make them visible to other packages.
16+
.library(
17+
name: "tauri-plugin-haptics",
18+
type: .static,
19+
targets: ["tauri-plugin-haptics"])
20+
],
21+
dependencies: [
22+
.package(name: "Tauri", path: "../.tauri/tauri-api")
23+
],
24+
targets: [
25+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
26+
// Targets can depend on other targets in this package, and on products in packages this package depends on.
27+
.target(
28+
name: "tauri-plugin-haptics",
29+
dependencies: [
30+
.byName(name: "Tauri")
31+
],
32+
path: "Sources")
33+
]
3334
)

‎plugins/log/ios/Package.swift‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,29 @@
66
import PackageDescription
77

88
let package = Package(
9-
name: "tauri-plugin-log",
10-
platforms: [
11-
.iOS(.v11),
12-
],
13-
products: [
14-
// Products define the executables and libraries a package produces, and make them visible to other packages.
15-
.library(
16-
name: "tauri-plugin-log",
17-
type: .static,
18-
targets: ["tauri-plugin-log"]),
19-
],
20-
dependencies: [
21-
.package(name: "Tauri", path: "../.tauri/tauri-api")
22-
],
23-
targets: [
24-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
25-
// Targets can depend on other targets in this package, and on products in packages this package depends on.
26-
.target(
27-
name: "tauri-plugin-log",
28-
dependencies: [
29-
.byName(name: "Tauri")
30-
],
31-
path: "Sources")
32-
]
9+
name: "tauri-plugin-log",
10+
platforms: [
11+
.macOS(.v10_13),
12+
.iOS(.v11),
13+
],
14+
products: [
15+
// Products define the executables and libraries a package produces, and make them visible to other packages.
16+
.library(
17+
name: "tauri-plugin-log",
18+
type: .static,
19+
targets: ["tauri-plugin-log"])
20+
],
21+
dependencies: [
22+
.package(name: "Tauri", path: "../.tauri/tauri-api")
23+
],
24+
targets: [
25+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
26+
// Targets can depend on other targets in this package, and on products in packages this package depends on.
27+
.target(
28+
name: "tauri-plugin-log",
29+
dependencies: [
30+
.byName(name: "Tauri")
31+
],
32+
path: "Sources")
33+
]
3334
)

‎plugins/nfc/ios/Package.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import PackageDescription
88
let package = Package(
99
name: "tauri-plugin-nfc",
1010
platforms: [
11-
.iOS(.v13)
11+
.macOS(.v10_13),
12+
.iOS(.v13),
1213
],
1314
products: [
1415
// Products define the executables and libraries a package produces, and make them visible to other packages.

‎plugins/notification/ios/Package.swift‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,32 @@
33
// SPDX-License-Identifier: Apache-2.0
44
// SPDX-License-Identifier: MIT
55

6-
7-
86
import PackageDescription
97

108
let package = Package(
11-
name: "tauri-plugin-notification",
12-
platforms: [
13-
.iOS(.v13),
14-
],
15-
products: [
16-
// Products define the executables and libraries a package produces, and make them visible to other packages.
17-
.library(
18-
name: "tauri-plugin-notification",
19-
type: .static,
20-
targets: ["tauri-plugin-notification"]),
21-
],
22-
dependencies: [
23-
.package(name: "Tauri", path: "../.tauri/tauri-api")
24-
],
25-
targets: [
26-
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
27-
// Targets can depend on other targets in this package, and on products in packages this package depends on.
28-
.target(
29-
name: "tauri-plugin-notification",
30-
dependencies: [
31-
.byName(name: "Tauri")
32-
],
33-
path: "Sources")
34-
]
9+
name: "tauri-plugin-notification",
10+
platforms: [
11+
.macOS(.v10_13),
12+
.iOS(.v13),
13+
],
14+
products: [
15+
// Products define the executables and libraries a package produces, and make them visible to other packages.
16+
.library(
17+
name: "tauri-plugin-notification",
18+
type: .static,
19+
targets: ["tauri-plugin-notification"])
20+
],
21+
dependencies: [
22+
.package(name: "Tauri", path: "../.tauri/tauri-api")
23+
],
24+
targets: [
25+
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
26+
// Targets can depend on other targets in this package, and on products in packages this package depends on.
27+
.target(
28+
name: "tauri-plugin-notification",
29+
dependencies: [
30+
.byName(name: "Tauri")
31+
],
32+
path: "Sources")
33+
]
3534
)

0 commit comments

Comments
 (0)