Skip to content

armgit / xtool

Public Imported from GitHub
0

Cross-platform Xcode replacement. Build and deploy iOS apps with SwiftPM on Linux, Windows, macOS.

Update dependencies (#222)

Kabir Oberai756a86785466
diff --git a/Package.resolved b/Package.resolved
index c50130a..e1d69b9 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -1,5 +1,5 @@
{
- "originHash" : "e56563c7d1a95af4aae9af2b653b49ad313c2cee55c9f30cd55b18dde2379e26",
+ "originHash" : "eb2a57fb4e4c2c83ff1f1fa55631db81988fc6e2e576a05a3cc5c8ed69432c3a",
"pins" : [
{
"identity" : "aexml",
@@ -15,8 +15,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/async-http-client.git",
"state" : {
- "revision" : "8430dd49d4e2b417f472141805c9691ec2923cb8",
- "version" : "1.29.0"
+ "revision" : "3a5b74a58782c3b4c1f0bc75e9b67b10c2494e8f",
+ "version" : "1.33.1"
}
},
{
@@ -33,8 +33,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
- "revision" : "5928286acce13def418ec36d05a001a9641086f2",
- "version" : "1.0.3"
+ "revision" : "dcccb979a2183b8df3334237e3dc1ae2b4116a86",
+ "version" : "1.2.0"
}
},
{
@@ -51,8 +51,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattpolzin/OpenAPIKit",
"state" : {
- "revision" : "c1dcd65ccbcc1f3e132293ff2338c72c49a9026d",
- "version" : "3.8.0"
+ "revision" : "57b6318128e3f901c93f4fbf98d1c1464ec168d3",
+ "version" : "6.2.0"
}
},
{
@@ -69,8 +69,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/onevcat/Rainbow.git",
"state" : {
- "revision" : "16da5c62dd737258c6df2e8c430f8a3202f655a7",
- "version" : "4.2.0"
+ "revision" : "cdf146ae671b2624917648b61c908d1244b98ca1",
+ "version" : "4.2.1"
}
},
{
@@ -96,8 +96,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
- "revision" : "cdd0ef3755280949551dc26dee5de9ddeda89f54",
- "version" : "1.6.2"
+ "revision" : "626b5b7b2f45e1b0b1c6f4a309296d1d21d7311b",
+ "version" : "1.7.1"
}
},
{
@@ -105,8 +105,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-asn1.git",
"state" : {
- "revision" : "f70225981241859eb4aa1a18a75531d26637c8cc",
- "version" : "1.4.0"
+ "revision" : "eb50cbd14606a9161cbc5d452f18797c90ef0bab",
+ "version" : "1.7.0"
}
},
{
@@ -114,8 +114,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-async-algorithms.git",
"state" : {
- "revision" : "042e1c4d9d19748c9c228f8d4ebc97bb1e339b0b",
- "version" : "1.0.4"
+ "revision" : "9d349bcc328ac3c31ce40e746b5882742a0d1272",
+ "version" : "1.1.3"
}
},
{
@@ -132,8 +132,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-certificates",
"state" : {
- "revision" : "4b092f15164144c24554e0a75e080a960c5190a6",
- "version" : "1.14.0"
+ "revision" : "bde8ca32a096825dfce37467137c903418c1893d",
+ "version" : "1.19.1"
}
},
{
@@ -150,8 +150,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-collections",
"state" : {
- "revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e",
- "version" : "1.3.0"
+ "revision" : "fea17c02d767f46b23070fdfdacc28a03a39232a",
+ "version" : "1.5.1"
}
},
{
@@ -163,13 +163,22 @@
"version" : "1.3.2"
}
},
+ {
+ "identity" : "swift-configuration",
+ "kind" : "remoteSourceControl",
+ "location" : "https://github.com/apple/swift-configuration.git",
+ "state" : {
+ "revision" : "be76c4ad929eb6c4bcaf3351799f2adf9e6848a9",
+ "version" : "1.2.0"
+ }
+ },
{
"identity" : "swift-crypto",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-crypto",
"state" : {
- "revision" : "95ba0316a9b733e92bb6b071255ff46263bbe7dc",
- "version" : "3.15.1"
+ "revision" : "1b6b2e274e85105bfa155183145a1dcfd63331f1",
+ "version" : "4.5.0"
}
},
{
@@ -177,8 +186,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
- "revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc",
- "version" : "1.10.0"
+ "revision" : "706feb7858a7f6c242879d137b8ee30926aa5b26",
+ "version" : "1.12.0"
}
},
{
@@ -186,8 +195,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-distributed-tracing.git",
"state" : {
- "revision" : "baa932c1336f7894145cbaafcd34ce2dd0b77c97",
- "version" : "1.3.1"
+ "revision" : "dc4030184203ffafbb2ec614352487235d747fe0",
+ "version" : "1.4.1"
}
},
{
@@ -195,8 +204,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-docc-plugin",
"state" : {
- "revision" : "3e4f133a77e644a5812911a0513aeb7288b07d06",
- "version" : "1.4.5"
+ "revision" : "647c708be89f834fa6a6d4945442793a77ddf5b6",
+ "version" : "1.5.0"
}
},
{
@@ -213,8 +222,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-structured-headers.git",
"state" : {
- "revision" : "1625f271afb04375bf48737a5572613248d0e7a0",
- "version" : "1.4.0"
+ "revision" : "933538faa42c432d385f02e07df0ace7c5ecfc47",
+ "version" : "1.7.0"
}
},
{
@@ -222,8 +231,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-http-types",
"state" : {
- "revision" : "a0a57e949a8903563aba4615869310c0ebf14c03",
- "version" : "1.4.0"
+ "revision" : "45eb0224913ea070ec4fba17291b9e7ecf4749ca",
+ "version" : "1.5.1"
}
},
{
@@ -231,8 +240,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-log.git",
"state" : {
- "revision" : "ce592ae52f982c847a4efc0dd881cc9eb32d29f2",
- "version" : "1.6.4"
+ "revision" : "5073617dac96330a486245e4c0179cb0a6fd2256",
+ "version" : "1.12.0"
}
},
{
@@ -240,8 +249,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio",
"state" : {
- "revision" : "a18bddb0acf7a40d982b2f128ce73ce4ee31f352",
- "version" : "2.86.2"
+ "revision" : "f71c8d2a5e74a2c6d11a0fbe324774b5d6084237",
+ "version" : "2.99.0"
}
},
{
@@ -249,8 +258,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-extras.git",
"state" : {
- "revision" : "a55c3dd3a81d035af8a20ce5718889c0dcab073d",
- "version" : "1.29.0"
+ "revision" : "5a48717e29f62cb8326d6d42e46b562ca93847a6",
+ "version" : "1.34.0"
}
},
{
@@ -258,8 +267,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-http2.git",
"state" : {
- "revision" : "5e9e99ec96c53bc2c18ddd10c1e25a3cd97c55e5",
- "version" : "1.38.0"
+ "revision" : "81cc18264f92cd307ff98430f89372711d4f6fe9",
+ "version" : "1.43.0"
}
},
{
@@ -267,8 +276,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-ssl.git",
"state" : {
- "revision" : "b2b043a8810ab6d51b3ff4df17f057d87ef1ec7c",
- "version" : "2.34.1"
+ "revision" : "3f337058ccd7243c4cac7911477d8ad4c598d4da",
+ "version" : "2.37.0"
}
},
{
@@ -276,8 +285,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-nio-transport-services.git",
"state" : {
- "revision" : "df6c28355051c72c884574a6c858bc54f7311ff9",
- "version" : "1.25.2"
+ "revision" : "67787bb645a5e67d2edcdfbe48a216cc549222d5",
+ "version" : "1.28.0"
}
},
{
@@ -294,8 +303,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swift-server/swift-openapi-async-http-client",
"state" : {
- "revision" : "915aeff168625b0f88a5810ee7ab8e9c00af671b",
- "version" : "1.1.0"
+ "revision" : "3681f659d9417652b8119f0adbdf57c04b6cb292",
+ "version" : "1.5.0"
}
},
{
@@ -303,8 +312,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-generator",
"state" : {
- "revision" : "d74223cc5595a8165181c4d9579243c932e5cd07",
- "version" : "1.10.3"
+ "revision" : "5dd0da1c7da7bac8f0c458a02a76f69031137a80",
+ "version" : "1.12.1"
}
},
{
@@ -312,8 +321,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-runtime",
"state" : {
- "revision" : "7722cf8eac05c1f1b5b05895b04cfcc29576d9be",
- "version" : "1.8.3"
+ "revision" : "f039fa6d6338aab5164f3d1be16281524c9a8f89",
+ "version" : "1.11.0"
}
},
{
@@ -321,8 +330,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-openapi-urlsession",
"state" : {
- "revision" : "279aa6b77be6aa842a4bf3c45fa79fa15edf3e07",
- "version" : "1.2.0"
+ "revision" : "576a65b4ffb8c12ddad4950dc21eea2ef071bec2",
+ "version" : "1.3.0"
}
},
{
@@ -330,17 +339,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-service-context.git",
"state" : {
- "revision" : "1983448fefc717a2bc2ebde5490fe99873c5b8a6",
- "version" : "1.2.1"
+ "revision" : "d0997351b0c7779017f88e7a93bc30a1878d7f29",
+ "version" : "1.3.0"
}
},
{
"identity" : "swift-service-lifecycle",
"kind" : "remoteSourceControl",
- "location" : "https://github.com/swift-server/swift-service-lifecycle.git",
+ "location" : "https://github.com/swift-server/swift-service-lifecycle",
"state" : {
- "revision" : "0fcc4c9c2d58dd98504c06f7308c86de775396ff",
- "version" : "2.9.0"
+ "revision" : "9829955b385e5bb88128b73f1b8389e9b9c3191a",
+ "version" : "2.11.0"
}
},
{
@@ -348,8 +357,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/swiftlang/swift-syntax",
"state" : {
- "revision" : "4799286537280063c85a32f09884cfbca301b1a1",
- "version" : "602.0.0"
+ "revision" : "9de99a78f099e59caf2b2beec65a4c45d54b2081",
+ "version" : "603.0.1"
}
},
{
@@ -357,8 +366,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-system",
"state" : {
- "revision" : "61e4ca4b81b9e09e2ec863b00c340eb13497dac6",
- "version" : "1.5.0"
+ "revision" : "7c6ad0fc39d0763e0b699210e4124afd5041c5df",
+ "version" : "1.6.4"
}
},
{
@@ -384,8 +393,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/saagarjha/unxip",
"state" : {
- "revision" : "03c32d6b4e7d8a9fb58747e5f8b83397da8bf5ba",
- "version" : "3.2.0"
+ "revision" : "6c3990517fcc4c1db6952fccf4c562fb14097601",
+ "version" : "3.3.0"
}
},
{
@@ -393,8 +402,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/mxcl/Version",
"state" : {
- "revision" : "67ce582bb9de70e1eb2ee41fd71aad3b5f86d97b",
- "version" : "2.2.0"
+ "revision" : "3043fcd2a50375db76d89ff206a612471833d1c2",
+ "version" : "2.2.1"
}
},
{
@@ -402,8 +411,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/vapor/websocket-kit.git",
"state" : {
- "revision" : "8666c92dbbb3c8eefc8008c9c8dcf50bfd302167",
- "version" : "2.16.1"
+ "revision" : "90bbbdab3ede12c803cfbe91646f291c092517a3",
+ "version" : "2.16.2"
}
},
{
@@ -411,8 +420,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/XcodeGen",
"state" : {
- "revision" : "21ac9944b0ab546a07422dbed86f33dd2ebd76f8",
- "version" : "2.44.1"
+ "revision" : "8d3d3476a69ae3e5d68e1adccc701c410c05eb36",
+ "version" : "2.45.4"
}
},
{
@@ -420,8 +429,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
- "revision" : "b1caa062d4aaab3e3d2bed5fe0ac5f8ce9bf84f4",
- "version" : "8.27.7"
+ "revision" : "01bb77000bc8c23a09ea2058f4954612f03cb705",
+ "version" : "9.10.1"
}
},
{
@@ -429,8 +438,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
- "revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618",
- "version" : "1.7.0"
+ "revision" : "dfd70507def84cb5fb821278448a262c6ff2bbad",
+ "version" : "1.9.0"
}
},
{
diff --git a/Package.swift b/Package.swift
index fe39331..5954c04 100644
--- a/Package.swift
+++ b/Package.swift
@@ -47,7 +47,7 @@ let package = Package(
.package(url: "https://github.com/apple/swift-system", from: "1.4.0"),
.package(url: "https://github.com/apple/swift-http-types", from: "1.3.1"),
.package(url: "https://github.com/apple/swift-certificates", from: "1.0.0"),
- .package(url: "https://github.com/apple/swift-crypto", from: "3.9.1"),
+ .package(url: "https://github.com/apple/swift-crypto", from: "4.5.0"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
.package(url: "https://github.com/apple/swift-openapi-generator", from: "1.6.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", from: "1.0.0"),
@@ -69,7 +69,7 @@ let package = Package(
.package(url: "https://github.com/saagarjha/unxip", from: "3.2.0"),
// TODO: just depend on tuist/XcodeProj instead
- .package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.43.0"),
+ .package(url: "https://github.com/yonaskolb/XcodeGen", from: "2.45.4"),
],
targets: [
.systemLibrary(name: "XADI"),
diff --git a/Sources/PackLib/XcodePacker.swift b/Sources/PackLib/XcodePacker.swift
index c9f828d..1126d58 100644
--- a/Sources/PackLib/XcodePacker.swift
+++ b/Sources/PackLib/XcodePacker.swift
@@ -49,9 +49,9 @@ public struct XcodePacker {
let encodedPlist = try PropertyListSerialization.data(fromPropertyList: plist, format: .xml, options: 0)
try infoPath.write(encodedPlist)
- var buildSettings: [String: Any] = [
- "PRODUCT_BUNDLE_IDENTIFIER": product.bundleID,
- "TARGETED_DEVICE_FAMILY": families.map { "\($0)" }.joined(separator: ","),
+ var buildSettings: [String: BuildSetting] = [
+ "PRODUCT_BUNDLE_IDENTIFIER": .string(product.bundleID),
+ "TARGETED_DEVICE_FAMILY": .string(families.map { "\($0)" }.joined(separator: ",")),
]
if product.type == .appExtension {
@@ -59,7 +59,7 @@ public struct XcodePacker {
}
if let entitlementsPath = product.entitlementsPath {
- buildSettings["CODE_SIGN_ENTITLEMENTS"] = fromProjectToRoot + Path(entitlementsPath)
+ buildSettings["CODE_SIGN_ENTITLEMENTS"] = .string((fromProjectToRoot + Path(entitlementsPath)).string)
}
let additionalDependencies: [Dependency] = if product.type == .application {
diff --git a/macOS/Gemfile b/macOS/Gemfile
index 943f83d..ac29d10 100644
--- a/macOS/Gemfile
+++ b/macOS/Gemfile
@@ -2,6 +2,3 @@ source 'https://rubygems.org'
gem 'fastlane'
gem 'fastlane-plugin-xcodegen'
-
-# https://github.com/fastlane/fastlane/issues/29183#issuecomment-2567093826
-gem 'ostruct'
diff --git a/macOS/Gemfile.lock b/macOS/Gemfile.lock
index 35a4e90..a4b44ba 100644
--- a/macOS/Gemfile.lock
+++ b/macOS/Gemfile.lock
@@ -3,13 +3,13 @@ GEM
specs:
CFPropertyList (3.0.8)
abbrev (0.1.2)
- addressable (2.8.8)
+ addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.4.0)
- aws-partitions (1.1200.0)
- aws-sdk-core (3.240.0)
+ aws-partitions (1.1249.0)
+ aws-sdk-core (3.247.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
@@ -17,18 +17,19 @@ GEM
bigdecimal
jmespath (~> 1, >= 1.6.1)
logger
- aws-sdk-kms (1.118.0)
- aws-sdk-core (~> 3, >= 3.239.1)
+ aws-sdk-kms (1.125.0)
+ aws-sdk-core (~> 3, >= 3.247.0)
aws-sigv4 (~> 1.5)
- aws-sdk-s3 (1.209.0)
- aws-sdk-core (~> 3, >= 3.234.0)
+ aws-sdk-s3 (1.222.0)
+ aws-sdk-core (~> 3, >= 3.247.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.12.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
- base64 (0.2.0)
- bigdecimal (4.0.1)
+ base64 (0.3.0)
+ benchmark (0.5.0)
+ bigdecimal (4.1.2)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
@@ -42,7 +43,7 @@ GEM
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.112.0)
- faraday (1.10.4)
+ faraday (1.10.5)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
@@ -67,19 +68,20 @@ GEM
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
- faraday-retry (1.0.3)
+ faraday-retry (1.0.4)
faraday_middleware (1.2.1)
faraday (~> 1.0)
- fastimage (2.4.0)
- fastlane (2.230.0)
- CFPropertyList (>= 2.3, < 4.0.0)
- abbrev (~> 0.1.2)
+ fastimage (2.4.1)
+ fastlane (2.234.0)
+ CFPropertyList (>= 2.3, < 5.0.0)
+ abbrev (~> 0.1)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
- aws-sdk-s3 (~> 1.0)
+ aws-sdk-s3 (~> 1.197)
babosa (>= 1.0.3, < 2.0.0)
- base64 (~> 0.2.0)
- bundler (>= 1.12.0, < 3.0.0)
+ base64 (~> 0.2)
+ benchmark (>= 0.1.0)
+ bundler (>= 1.17.3, < 5.0.0)
colored (~> 1.2)
commander (~> 4.6)
csv (~> 3.3)
@@ -90,11 +92,11 @@ GEM
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
- fastlane-sirp (>= 1.0.0)
+ fastlane-sirp (>= 1.1.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
- google-cloud-env (>= 1.6.0, < 2.0.0)
+ google-cloud-env (>= 1.6.0, <= 2.1.1)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
@@ -103,10 +105,11 @@ GEM
logger (>= 1.6, < 2.0)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
- mutex_m (~> 0.3.0)
+ mutex_m (~> 0.3)
naturally (~> 2.2)
- nkf (~> 0.2.0)
+ nkf (~> 0.2)
optparse (>= 0.1.1, < 1.0.0)
+ ostruct (>= 0.1.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.5)
@@ -122,41 +125,42 @@ GEM
fastlane-plugin-brew (0.1.1)
fastlane-plugin-xcodegen (1.1.0)
fastlane-plugin-brew (~> 0.1.1)
- fastlane-sirp (1.0.0)
- sysrandom (~> 1.0)
+ fastlane-sirp (1.1.0)
gh_inspector (1.1.3)
- google-apis-androidpublisher_v3 (0.54.0)
- google-apis-core (>= 0.11.0, < 2.a)
- google-apis-core (0.11.3)
+ google-apis-androidpublisher_v3 (0.100.0)
+ google-apis-core (>= 0.15.0, < 2.a)
+ google-apis-core (0.18.0)
addressable (~> 2.5, >= 2.5.1)
- googleauth (>= 0.16.2, < 2.a)
- httpclient (>= 2.8.1, < 3.a)
+ googleauth (~> 1.9)
+ httpclient (>= 2.8.3, < 3.a)
mini_mime (~> 1.0)
+ mutex_m
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
- rexml
- google-apis-iamcredentials_v1 (0.17.0)
- google-apis-core (>= 0.11.0, < 2.a)
- google-apis-playcustomapp_v1 (0.13.0)
- google-apis-core (>= 0.11.0, < 2.a)
- google-apis-storage_v1 (0.31.0)
- google-apis-core (>= 0.11.0, < 2.a)
+ google-apis-iamcredentials_v1 (0.27.0)
+ google-apis-core (>= 0.15.0, < 2.a)
+ google-apis-playcustomapp_v1 (0.17.0)
+ google-apis-core (>= 0.15.0, < 2.a)
+ google-apis-storage_v1 (0.62.0)
+ google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.8.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
- google-cloud-env (1.6.0)
- faraday (>= 0.17.3, < 3.0)
- google-cloud-errors (1.5.0)
- google-cloud-storage (1.47.0)
+ google-cloud-env (2.1.1)
+ faraday (>= 1.0, < 3.a)
+ google-cloud-errors (1.6.0)
+ google-cloud-storage (1.60.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
- google-apis-iamcredentials_v1 (~> 0.1)
- google-apis-storage_v1 (~> 0.31.0)
+ google-apis-core (>= 0.18, < 2)
+ google-apis-iamcredentials_v1 (~> 0.18)
+ google-apis-storage_v1 (>= 0.42)
google-cloud-core (~> 1.6)
- googleauth (>= 0.16.2, < 2.a)
+ googleauth (~> 1.9)
mini_mime (~> 1.0)
- googleauth (1.8.1)
- faraday (>= 0.17.3, < 3.a)
+ googleauth (1.11.2)
+ faraday (>= 1.0, < 3.a)
+ google-cloud-env (~> 2.1)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
@@ -167,13 +171,13 @@ GEM
httpclient (2.9.0)
mutex_m
jmespath (1.6.2)
- json (2.18.0)
+ json (2.19.5)
jwt (2.10.2)
base64
logger (1.7.0)
mini_magick (4.13.2)
mini_mime (1.1.5)
- multi_json (1.19.1)
+ multi_json (1.21.1)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
@@ -183,13 +187,13 @@ GEM
os (1.1.4)
ostruct (0.6.3)
plist (3.7.2)
- public_suffix (7.0.2)
- rake (13.3.1)
+ public_suffix (7.0.5)
+ rake (13.4.2)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
- retriable (3.1.2)
+ retriable (3.4.1)
rexml (3.4.4)
rouge (3.28.0)
ruby2_keywords (0.0.5)
@@ -203,7 +207,6 @@ GEM
simctl (1.6.10)
CFPropertyList
naturally
- sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
@@ -234,7 +237,6 @@ PLATFORMS
DEPENDENCIES
fastlane
fastlane-plugin-xcodegen
- ostruct
BUNDLED WITH
2.6.7
diff --git a/macOS/fastlane/Fastfile b/macOS/fastlane/Fastfile
index 302de2a..0dbfea9 100644
--- a/macOS/fastlane/Fastfile
+++ b/macOS/fastlane/Fastfile
@@ -1,5 +1,3 @@
-require_relative "spaceship_patch"
-
default_platform(:mac)
ENV["FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT"] = "120"
diff --git a/macOS/fastlane/spaceship_patch.rb b/macOS/fastlane/spaceship_patch.rb
deleted file mode 100644
index 91409f5..0000000
--- a/macOS/fastlane/spaceship_patch.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require "spaceship"
-
-# the ASC API has started (June 2025) throwing a fit when it
-# sees DEVELOPER_ID_APPLICATION_G2 in the certificate types filter.
-# so we patch Spaceship to filter locally instead of via the API.
-# c.f. https://github.com/fastlane/fastlane/pull/29588
-
-class << Spaceship::ConnectAPI::Certificate
- alias_method :all_orig, :all
-
- def all(**args)
- types = args[:filter]&.delete(:certificateType)&.split(",")
- certs = all_orig(**args)
- types ? certs.select { |cert| types.include?(cert.certificate_type) } : certs
- end
-end