Update project (#1494)

- Sort dependencies a bit more.
- Remove .git extension in DesignKit.
- Regenerate project using XcodeGen 2.36.1
This commit is contained in:
Doug
2023-08-15 11:42:18 +01:00
committed by GitHub
parent b2928a0dc6
commit 0879102e84
9 changed files with 34 additions and 31 deletions
+3 -3
View File
@@ -12,9 +12,9 @@ let package = Package(
.library(name: "DesignKit", targets: ["DesignKit"]) .library(name: "DesignKit", targets: ["DesignKit"])
], ],
dependencies: [ dependencies: [
.package(url: "https://github.com/vector-im/compound-ios.git", revision: "89e3ed5adef33be7eb65137b861833ffae64f961"), .package(url: "https://github.com/vector-im/compound-ios", revision: "89e3ed5adef33be7eb65137b861833ffae64f961"),
.package(url: "https://github.com/vector-im/element-design-tokens.git", exact: "0.0.3"), .package(url: "https://github.com/vector-im/element-design-tokens", exact: "0.0.3"),
.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.9.0") .package(url: "https://github.com/siteline/SwiftUI-Introspect", from: "0.9.0")
], ],
targets: [ targets: [
.target(name: "DesignKit", .target(name: "DesignKit",
+4 -3
View File
@@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 51; objectVersion = 54;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
@@ -3902,7 +3902,8 @@
AC22997D58D612146053154D /* Project object */ = { AC22997D58D612146053154D /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 1200; BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = Element; ORGANIZATIONNAME = Element;
TargetAttributes = { TargetAttributes = {
0E28CD62691FDBC63147D5E3 = { 0E28CD62691FDBC63147D5E3 = {
@@ -3928,7 +3929,7 @@
}; };
}; };
buildConfigurationList = 7AE41FCCF9D1352E2770D1F9 /* Build configuration list for PBXProject "ElementX" */; buildConfigurationList = 7AE41FCCF9D1352E2770D1F9 /* Build configuration list for PBXProject "ElementX" */;
compatibilityVersion = "Xcode 11.0"; compatibilityVersion = "Xcode 14.0";
developmentRegion = en; developmentRegion = en;
hasScannedForEncodings = 0; hasScannedForEncodings = 0;
knownRegions = ( knownRegions = (
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1200" LastUpgradeVersion = "1430"
version = "1.7"> version = "1.7">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1200" LastUpgradeVersion = "1430"
version = "1.7"> version = "1.7">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1200" LastUpgradeVersion = "1430"
wasCreatedForAppExtension = "YES" wasCreatedForAppExtension = "YES"
version = "1.7"> version = "1.7">
<BuildAction <BuildAction
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1200" LastUpgradeVersion = "1430"
wasCreatedForAppExtension = "YES" wasCreatedForAppExtension = "YES"
version = "1.7"> version = "1.7">
<BuildAction <BuildAction
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1200" LastUpgradeVersion = "1430"
version = "1.7"> version = "1.7">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "1200" LastUpgradeVersion = "1430"
version = "1.7"> version = "1.7">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
+21 -19
View File
@@ -42,25 +42,28 @@ include:
- path: NCE/SupportingFiles/target.yml - path: NCE/SupportingFiles/target.yml
packages: packages:
# Element/Matrix dependencies
MatrixRustSDK: MatrixRustSDK:
url: https://github.com/matrix-org/matrix-rust-components-swift url: https://github.com/matrix-org/matrix-rust-components-swift
exactVersion: 1.0.106-alpha exactVersion: 1.0.106-alpha
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
DesignKit: DesignKit:
path: DesignKit path: DesignKit
Mapbox:
url: https://github.com/maplibre/maplibre-gl-native-distribution
minorVersion: 5.13.0
Compound: Compound:
url: https://github.com/vector-im/compound-ios url: https://github.com/vector-im/compound-ios
revision: 89e3ed5adef33be7eb65137b861833ffae64f961 revision: 89e3ed5adef33be7eb65137b861833ffae64f961
# path: ../compound-ios # path: ../compound-ios
Algorithms:
url: https://github.com/apple/swift-algorithms
minorVersion: 1.0.0
AnalyticsEvents: AnalyticsEvents:
url: https://github.com/matrix-org/matrix-analytics-events url: https://github.com/matrix-org/matrix-analytics-events
minorVersion: 0.6.0 minorVersion: 0.6.0
Emojibase:
url: https://github.com/matrix-org/emojibase-bindings
minorVersion: 1.0.0
# External dependencies
Algorithms:
url: https://github.com/apple/swift-algorithms
minorVersion: 1.0.0
Collections: Collections:
url: https://github.com/apple/swift-collections url: https://github.com/apple/swift-collections
minorVersion: 1.0.0 minorVersion: 1.0.0
@@ -70,6 +73,9 @@ packages:
DTCoreText: DTCoreText:
url: https://github.com/Cocoanetics/DTCoreText url: https://github.com/Cocoanetics/DTCoreText
exactVersion: 1.6.26 exactVersion: 1.6.26
GZIP:
url: https://github.com/nicklockwood/GZIP
minorVersion: 1.3.0
KeychainAccess: KeychainAccess:
url: https://github.com/kishikawakatsumi/KeychainAccess url: https://github.com/kishikawakatsumi/KeychainAccess
minorVersion: 4.2.0 minorVersion: 4.2.0
@@ -82,31 +88,27 @@ packages:
LRUCache: LRUCache:
url: https://github.com/nicklockwood/LRUCache url: https://github.com/nicklockwood/LRUCache
minorVersion: 1.0.4 minorVersion: 1.0.4
SwiftUIIntrospect: Mapbox:
url: https://github.com/siteline/SwiftUI-Introspect url: https://github.com/maplibre/maplibre-gl-native-distribution
minorVersion: 0.9.0 minorVersion: 5.13.0
PostHog: PostHog:
url: https://github.com/PostHog/posthog-ios url: https://github.com/PostHog/posthog-ios
minorVersion: 2.0.3 minorVersion: 2.0.3
SwiftState:
url: https://github.com/ReactKit/SwiftState
minorVersion: 6.0.0
GZIP:
url: https://github.com/nicklockwood/GZIP
minorVersion: 1.3.0
Sentry: Sentry:
url: https://github.com/getsentry/sentry-cocoa url: https://github.com/getsentry/sentry-cocoa
minorVersion: 8.6.0 minorVersion: 8.6.0
SnapshotTesting: SnapshotTesting:
url: https://github.com/pointfreeco/swift-snapshot-testing url: https://github.com/pointfreeco/swift-snapshot-testing
minorVersion: 1.11.0 minorVersion: 1.11.0
SwiftState:
url: https://github.com/ReactKit/SwiftState
minorVersion: 6.0.0
SwiftUIIntrospect:
url: https://github.com/siteline/SwiftUI-Introspect
minorVersion: 0.9.0
URLRouting: URLRouting:
url: https://github.com/pointfreeco/swift-url-routing url: https://github.com/pointfreeco/swift-url-routing
minorVersion: 0.5.0 minorVersion: 0.5.0
Version: Version:
url: https://github.com/mxcl/Version url: https://github.com/mxcl/Version
minorVersion: 2.0.0 minorVersion: 2.0.0
Emojibase:
url: https://github.com/matrix-org/emojibase-bindings
minorVersion: 1.0.0