Skip to content

Commit 62729d6

Browse files
cgrindelcgrindel
authored
Merge branch 'main' into sebastianv1/fix-resource-warnings
2 parents ab5810e + 1c73be4 commit 62729d6

File tree

38 files changed

+63
-63
lines changed

38 files changed

+63
-63
lines changed

‎.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.1.1
1+
8.2.1

‎bzlmod/workspace/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212

1313
# The apple_support bazel_dep must come before the rules_cc.
1414
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
15-
bazel_dep(name = "apple_support", version = "1.19.0")
15+
bazel_dep(name = "apple_support", version = "1.21.1")
1616
bazel_dep(
1717
name = "rules_swift",
1818
version = "2.7.0",

‎examples/firebase_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212

1313
# The apple_support bazel_dep must come before the rules_cc.
1414
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
15-
bazel_dep(name = "apple_support", version = "1.19.0")
15+
bazel_dep(name = "apple_support", version = "1.21.1")
1616
bazel_dep(
1717
name = "rules_swift",
1818
version = "2.7.0",

‎examples/google_maps_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/google_maps_example/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ import PackageDescription
55
let package = Package(
66
name: "google_maps_example",
77
dependencies: [
8-
.package(url: "https://github.com/googlemaps/ios-maps-sdk", from: "9.3.0"),
8+
.package(url: "https://github.com/googlemaps/ios-maps-sdk", from: "9.4.0"),
99
]
1010
)

‎examples/grpc_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ bazel_dep(name = "protobuf", version = "30.2")
2121
bazel_dep(name = "rules_proto", version = "7.1.0")
2222

2323
# Required for compiling objc:
24-
bazel_dep(name = "apple_support", version = "1.19.0")
24+
bazel_dep(name = "apple_support", version = "1.21.1")
2525

2626
# Required for swift_binary and swift_proto_library targets:
2727
bazel_dep(name = "rules_swift", version = "2.7.0", repo_name = "build_bazel_rules_swift")

‎examples/grpc_example/Package.resolved

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"kind" : "remoteSourceControl",
66
"location" : "https://github.com/grpc/grpc-swift.git",
77
"state" : {
8-
"revision" : "384a8dbb494f14e86d8b9d1a38d96b01a35933c7",
9-
"version" : "2.1.0"
8+
"revision" : "c4d6281784f50bf2e60d3af45e83be1194056062",
9+
"version" : "2.1.2"
1010
}
1111
},
1212
{
1313
"identity" : "grpc-swift-nio-transport",
1414
"kind" : "remoteSourceControl",
1515
"location" : "https://github.com/grpc/grpc-swift-nio-transport.git",
1616
"state" : {
17-
"revision" : "803769ec6ff5aac75d951cfabb4273bc255420d5",
18-
"version" : "1.0.1"
17+
"revision" : "9bd1b5b5e31f3fae497e84c2806777899183679b",
18+
"version" : "1.0.3"
1919
}
2020
},
2121
{

‎examples/grpc_example/Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import PackageDescription
55
let package = Package(
66
name: "grpc_example",
77
dependencies: [
8-
.package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.1.0"),
8+
.package(url: "https://github.com/grpc/grpc-swift.git", exact: "2.1.2"),
99
.package(url: "https://github.com/grpc/grpc-swift-protobuf.git", exact: "1.1.0"),
10-
.package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "1.0.1"),
10+
.package(url: "https://github.com/grpc/grpc-swift-nio-transport.git", exact: "1.0.3"),
1111
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.28.1"),
1212
]
1313
)

‎examples/interesting_deps/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1717

1818
# The apple_support bazel_dep must come before the rules_cc.
1919
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
20-
bazel_dep(name = "apple_support", version = "1.19.0")
20+
bazel_dep(name = "apple_support", version = "1.21.1")
2121
bazel_dep(name = "platforms", version = "0.0.11")
2222
bazel_dep(
2323
name = "rules_swift",

‎examples/interesting_deps/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ let package = Package(
66
name: "MySwiftPackage",
77
dependencies: [
88
.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", from: "3.8.5"),
9-
.package(url: "https://github.com/GEOSwift/GEOSwift", from: "11.1.0"),
9+
.package(url: "https://github.com/GEOSwift/GEOSwift", from: "11.2.0"),
1010
.package(url: "https://github.com/OpenCombine/OpenCombine", from: "0.14.0"),
1111
.package(url: "https://github.com/SDWebImage/libwebp-Xcode.git", from: "1.5.0"),
1212
.package(url: "https://github.com/apple/swift-log", from: "1.6.3"),

‎examples/ios_sim/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212

1313
# The apple_support bazel_dep must come before the rules_cc.
1414
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
15-
bazel_dep(name = "apple_support", version = "1.19.0")
15+
bazel_dep(name = "apple_support", version = "1.21.1")
1616
bazel_dep(
1717
name = "rules_swift",
1818
version = "2.7.0",

‎examples/ios_sim/Package.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{
1313
"identity" : "swift-cmark",
1414
"kind" : "remoteSourceControl",
15-
"location" : "https://github.com/apple/swift-cmark.git",
15+
"location" : "https://github.com/swiftlang/swift-cmark.git",
1616
"state" : {
1717
"revision" : "b022b08312decdc46585e0b3440d97f6f22ef703",
1818
"version" : "0.6.0"
@@ -32,8 +32,8 @@
3232
"kind" : "remoteSourceControl",
3333
"location" : "https://github.com/apple/swift-markdown.git",
3434
"state" : {
35-
"revision" : "8f79cb175981458a0a27e76cb42fee8e17b1a993",
36-
"version" : "0.5.0"
35+
"revision" : "ea79e83c8744d2b50b0dc2d5bbd1e857e1253bf9",
36+
"version" : "0.6.0"
3737
}
3838
},
3939
{

‎examples/ios_sim/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ let package = Package(
66
name: "ios_sim",
77
dependencies: [
88
.package(url: "https://github.com/apple/swift-nio.git", exact: "2.81.0"),
9-
.package(url: "https://github.com/apple/swift-markdown.git", exact: "0.5.0"),
9+
.package(url: "https://github.com/apple/swift-markdown.git", exact: "0.6.0"),
1010
]
1111
)

‎examples/lottie_ios_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/messagekit_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/messagekit_example/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ let package = Package(
66
name: "messagekit_example",
77
dependencies: [
88
.package(url: "https://github.com/MessageKit/MessageKit", from: "5.0.0"),
9-
.package(url: "https://github.com/onevcat/Kingfisher", from: "8.3.1"),
9+
.package(url: "https://github.com/onevcat/Kingfisher", from: "8.3.2"),
1010
]
1111
)

‎examples/nimble_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/objc_code/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1717

1818
# The apple_support bazel_dep must come before the rules_cc.
1919
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
20-
bazel_dep(name = "apple_support", version = "1.19.0")
20+
bazel_dep(name = "apple_support", version = "1.21.1")
2121
bazel_dep(
2222
name = "rules_swift",
2323
version = "2.7.0",

‎examples/phone_number_kit/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/pkg_manifest_minimal/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212

1313
# The apple_support bazel_dep must come before the rules_cc.
1414
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
15-
bazel_dep(name = "apple_support", version = "1.19.0")
15+
bazel_dep(name = "apple_support", version = "1.21.1")
1616
bazel_dep(
1717
name = "rules_swift",
1818
version = "2.7.0",

‎examples/resources_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/shake_ios_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/skip_local_transitive_dependencies_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/snapkit_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/soto_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212

1313
# The apple_support bazel_dep must come before the rules_cc.
1414
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
15-
bazel_dep(name = "apple_support", version = "1.19.0")
15+
bazel_dep(name = "apple_support", version = "1.21.1")
1616
bazel_dep(
1717
name = "rules_swift",
1818
version = "2.7.0",

‎examples/stripe_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212

1313
# The apple_support bazel_dep must come before the rules_cc.
1414
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
15-
bazel_dep(name = "apple_support", version = "1.19.0")
15+
bazel_dep(name = "apple_support", version = "1.21.1")
1616
bazel_dep(
1717
name = "rules_swift",
1818
version = "2.7.0",

‎examples/stripe_example/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"kind" : "remoteSourceControl",
66
"location" : "https://github.com/stripe/stripe-ios-spm.git",
77
"state" : {
8-
"revision" : "4d6c0a1c0af2f4ef8c89a481a36e70c741ba55e1",
9-
"version" : "24.11.0"
8+
"revision" : "8ed42915acecf4910cc3da4d61d1866d3e5ec40a",
9+
"version" : "24.11.1"
1010
}
1111
}
1212
],

‎examples/stripe_example/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let package = Package(
77
dependencies: [
88
.package(
99
url: "https://github.com/stripe/stripe-ios-spm.git",
10-
from: "24.8.0"
10+
from: "24.9.0"
1111
),
1212
]
1313
)

‎examples/swift_package_registry_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/symlink_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local_path_override(
99

1010
bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "apple_support", version = "1.19.0")
12+
bazel_dep(name = "apple_support", version = "1.21.1")
1313
bazel_dep(
1414
name = "rules_swift",
1515
version = "2.7.0",

‎examples/tca_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ bazel_dep(name = "cgrindel_bazel_starlib", version = "0.25.2")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212
bazel_dep(
1313
name = "apple_support",
14-
version = "1.19.0",
14+
version = "1.21.1",
1515
)
1616
bazel_dep(
1717
name = "rules_swift",

‎examples/vapor_example/MODULE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
1212

1313
# The apple_support bazel_dep must come before the rules_cc.
1414
# https://github.com/bazelbuild/apple_support#incompatible-toolchain-resolution
15-
bazel_dep(name = "apple_support", version = "1.19.0")
15+
bazel_dep(name = "apple_support", version = "1.21.1")
1616
bazel_dep(
1717
name = "rules_swift",
1818
version = "2.7.0",

‎examples/vapor_example/swift/Package.resolved

+14-14
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@
4141
"kind" : "remoteSourceControl",
4242
"location" : "https://github.com/vapor/fluent-kit.git",
4343
"state" : {
44-
"revision" : "f12a66814657abd2e309c273a0825c4f978acebe",
45-
"version" : "1.50.4"
44+
"revision" : "1385c48f98e1e44335b251cc11dc11a0a50ab853",
45+
"version" : "1.52.1"
4646
}
4747
},
4848
{
4949
"identity" : "fluent-sqlite-driver",
5050
"kind" : "remoteSourceControl",
5151
"location" : "https://github.com/vapor/fluent-sqlite-driver.git",
5252
"state" : {
53-
"revision" : "6e3a5ff7f2cb733771a6bd71dd3a491cce79f24d",
54-
"version" : "4.8.0"
53+
"revision" : "73529a63ab11c7fe87da17b5a67a1b1f58c020f8",
54+
"version" : "4.8.1"
5555
}
5656
},
5757
{
@@ -77,8 +77,8 @@
7777
"kind" : "remoteSourceControl",
7878
"location" : "https://github.com/vapor/sql-kit.git",
7979
"state" : {
80-
"revision" : "e0b35ff07601465dd9f3af19a1c23083acaae3bd",
81-
"version" : "3.32.0"
80+
"revision" : "baf0d8684a43f16cd11ebcc67300c8ab5cb5d078",
81+
"version" : "3.33.0"
8282
}
8383
},
8484
{
@@ -140,8 +140,8 @@
140140
"kind" : "remoteSourceControl",
141141
"location" : "https://github.com/apple/swift-crypto.git",
142142
"state" : {
143-
"revision" : "a6ce32a18b81b04ce7e897d1d98df6eb2da04786",
144-
"version" : "3.12.2"
143+
"revision" : "e8d6eba1fef23ae5b359c46b03f7d94be2f41fed",
144+
"version" : "3.12.3"
145145
}
146146
},
147147
{
@@ -158,17 +158,17 @@
158158
"kind" : "remoteSourceControl",
159159
"location" : "https://github.com/apple/swift-http-structured-headers.git",
160160
"state" : {
161-
"revision" : "d01361d32e14ae9b70ea5bd308a3794a198a2706",
162-
"version" : "1.2.0"
161+
"revision" : "8e769facea6b7d46ea60e5e93635a384fd573480",
162+
"version" : "1.2.1"
163163
}
164164
},
165165
{
166166
"identity" : "swift-http-types",
167167
"kind" : "remoteSourceControl",
168168
"location" : "https://github.com/apple/swift-http-types.git",
169169
"state" : {
170-
"revision" : "ef18d829e8b92d731ad27bb81583edd2094d1ce3",
171-
"version" : "1.3.1"
170+
"revision" : "a0a57e949a8903563aba4615869310c0ebf14c03",
171+
"version" : "1.4.0"
172172
}
173173
},
174174
{
@@ -266,8 +266,8 @@
266266
"kind" : "remoteSourceControl",
267267
"location" : "https://github.com/vapor/vapor.git",
268268
"state" : {
269-
"revision" : "f6459d6417d4968f91979224dd8fd38fa99b042c",
270-
"version" : "4.114.0"
269+
"revision" : "87b0edd2633c35de543cb7573efe5fbf456181bc",
270+
"version" : "4.114.1"
271271
}
272272
},
273273
{

‎examples/vapor_example/swift/Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import PackageDescription
55
let package = Package(
66
name: "vapor_example",
77
dependencies: [
8-
.package(url: "https://github.com/vapor/vapor.git", exact: "4.114.0"),
8+
.package(url: "https://github.com/vapor/vapor.git", exact: "4.114.1"),
99
.package(url: "https://github.com/vapor/fluent.git", exact: "4.12.0"),
10-
.package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.8.0"),
10+
.package(url: "https://github.com/vapor/fluent-sqlite-driver.git", exact: "4.8.1"),
1111
]
1212
)

0 commit comments

Comments
 (0)