diff --git a/.gitignore b/.gitignore index a37f5ecabd..3e4e095b7d 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,7 @@ xcuserdata/ /Packages xcuserdata/ DerivedData/ -.swiftpm/config/registries.json -.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata +.swiftpm .netrc # fastlane diff --git a/DesignKit/Package.resolved b/DesignKit/Package.resolved new file mode 100644 index 0000000000..54808346aa --- /dev/null +++ b/DesignKit/Package.resolved @@ -0,0 +1,23 @@ +{ + "pins" : [ + { + "identity" : "element-design-tokens", + "kind" : "remoteSourceControl", + "location" : "https://github.com/vector-im/element-design-tokens.git", + "state" : { + "revision" : "63e40f10b336c136d6d05f7967e4565e37d3d760", + "version" : "0.0.3" + } + }, + { + "identity" : "swiftui-introspect", + "kind" : "remoteSourceControl", + "location" : "https://github.com/siteline/SwiftUI-Introspect.git", + "state" : { + "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24", + "version" : "0.1.4" + } + } + ], + "version" : 2 +} diff --git a/DesignKit/Package.swift b/DesignKit/Package.swift new file mode 100644 index 0000000000..4c244d7428 --- /dev/null +++ b/DesignKit/Package.swift @@ -0,0 +1,29 @@ +// swift-tools-version: 5.7 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "DesignKit", + platforms: [ + .iOS(.v14) + ], + products: [ + .library(name: "DesignKit", targets: ["DesignKit"]) + ], + dependencies: [ + .package(url: "https://github.com/vector-im/element-design-tokens.git", exact: "0.0.3"), + .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.4") + ], + targets: [ + .target(name: "DesignKit", + dependencies: [ + .product(name: "DesignTokens", package: "element-design-tokens"), + .product(name: "Introspect", package: "SwiftUI-Introspect") + ], + path: "Sources"), + .testTarget(name: "DesignKitTests", + dependencies: ["DesignKit"], + path: "Tests") + ] +) diff --git a/DesignKitTests/DesignKitTests.swift b/DesignKit/Tests/DesignKitTests.swift similarity index 100% rename from DesignKitTests/DesignKitTests.swift rename to DesignKit/Tests/DesignKitTests.swift diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj index 6c019fc54e..846dbe98c8 100644 --- a/ElementX.xcodeproj/project.pbxproj +++ b/ElementX.xcodeproj/project.pbxproj @@ -680,6 +680,7 @@ 47111410B6E659A697D472B5 /* RoomProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomProxyProtocol.swift; sourceTree = ""; }; 471EB7D96AFEA8D787659686 /* EmoteRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineView.swift; sourceTree = ""; }; 475EB595D7527E9A8A14043E /* uz */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uz; path = uz.lproj/Localizable.strings; sourceTree = ""; }; + 478BE8591BD13E908EF70C0C /* DesignKit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = DesignKit; path = DesignKit; sourceTree = SOURCE_ROOT; }; 4798B3B7A1E8AE3901CEE8C6 /* FramePreferenceKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FramePreferenceKey.swift; sourceTree = ""; }; 47EBB5D698CE9A25BB553A2D /* Strings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Strings.swift; sourceTree = ""; }; 48CE6BF18E542B32FA52CE06 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fa; path = fa.lproj/Localizable.stringsdict; sourceTree = ""; }; @@ -964,7 +965,6 @@ D0A45283CF1DB96E583BECA6 /* ImageRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageRoomTimelineView.swift; sourceTree = ""; }; D1A9CCCF53495CF3D7B19FCE /* MockSessionVerificationControllerProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockSessionVerificationControllerProxy.swift; sourceTree = ""; }; D263254AFE5B7993FFBBF324 /* NSE.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NSE.entitlements; sourceTree = ""; }; - D31DC8105C6233E5FFD9B84C /* element-x-ios */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "element-x-ios"; path = .; sourceTree = SOURCE_ROOT; }; D33116993D54FADC0C721C1F /* Application.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Application.swift; sourceTree = ""; }; D3D455BC2423D911A62ACFB2 /* NSELogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSELogger.swift; sourceTree = ""; }; D4DA544B2520BFA65D6DB4BB /* target.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = target.yml; sourceTree = ""; }; @@ -1242,13 +1242,6 @@ path = Resources; sourceTree = ""; }; - 285079C24A5189C48284CC47 /* VideoPlayer */ = { - isa = PBXGroup; - children = ( - ); - path = VideoPlayer; - sourceTree = ""; - }; 2D6DC9871FD7173E51D67C73 /* Cache */ = { isa = PBXGroup; children = ( @@ -1965,7 +1958,7 @@ 9413F680ECDFB2B0DDB0DEF2 /* Packages */ = { isa = PBXGroup; children = ( - D31DC8105C6233E5FFD9B84C /* element-x-ios */, + 478BE8591BD13E908EF70C0C /* DesignKit */, ); name = Packages; sourceTree = SOURCE_ROOT; @@ -2362,7 +2355,6 @@ 679E9837ECA8D6776079D16E /* RoomScreen */, D958761758AA1110476DE6A3 /* SessionVerification */, 70B74A432C241E56A7ACE610 /* Settings */, - 285079C24A5189C48284CC47 /* VideoPlayer */, ); path = Screens; sourceTree = ""; diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1c31cd0d95..e4da89900d 100644 --- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -108,15 +108,6 @@ "version" : "7.30.2" } }, - { - "identity" : "swift-argument-parser", - "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-argument-parser", - "state" : { - "revision" : "fddd1c00396eed152c45a46bea9f47b98e59301d", - "version" : "1.2.0" - } - }, { "identity" : "swift-snapshot-testing", "kind" : "remoteSourceControl", @@ -152,15 +143,6 @@ "revision" : "12b5acf96d98f91d50de447369bd18df74600f1a", "version" : "1.9.6" } - }, - { - "identity" : "yams", - "kind" : "remoteSourceControl", - "location" : "https://github.com/jpsim/Yams", - "state" : { - "revision" : "01835dc202670b5bb90d07f3eae41867e9ed29f6", - "version" : "5.0.1" - } } ], "version" : 2 diff --git a/Package.resolved b/Package.resolved index d1eb8040e9..87218ce45c 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,14 +1,5 @@ { "pins" : [ - { - "identity" : "element-design-tokens", - "kind" : "remoteSourceControl", - "location" : "https://github.com/vector-im/element-design-tokens.git", - "state" : { - "revision" : "63e40f10b336c136d6d05f7967e4565e37d3d760", - "version" : "0.0.3" - } - }, { "identity" : "swift-argument-parser", "kind" : "remoteSourceControl", @@ -18,15 +9,6 @@ "version" : "1.2.0" } }, - { - "identity" : "swiftui-introspect", - "kind" : "remoteSourceControl", - "location" : "https://github.com/siteline/SwiftUI-Introspect.git", - "state" : { - "revision" : "f2616860a41f9d9932da412a8978fec79c06fe24", - "version" : "0.1.4" - } - }, { "identity" : "yams", "kind" : "remoteSourceControl", diff --git a/Package.swift b/Package.swift index 3d08c6f512..2d84e0b29a 100644 --- a/Package.swift +++ b/Package.swift @@ -6,30 +6,16 @@ import PackageDescription let package = Package( name: "Element Swift", platforms: [ - .iOS(.v14), .macOS(.v13) ], products: [ - .library(name: "DesignKit", targets: ["DesignKit"]), .executable(name: "tools", targets: ["Tools"]) ], dependencies: [ - .package(url: "https://github.com/vector-im/element-design-tokens.git", exact: "0.0.3"), - .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.4"), - /* Command line tools dependencies */ .package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.0"), .package(url: "https://github.com/jpsim/Yams", from: "5.0.1") ], targets: [ - .target(name: "DesignKit", - dependencies: [ - .product(name: "DesignTokens", package: "element-design-tokens"), - .product(name: "Introspect", package: "SwiftUI-Introspect") - ], - path: "DesignKit"), - .testTarget(name: "DesignKitTests", - dependencies: ["DesignKit"], - path: "DesignKitTests"), .executableTarget(name: "Tools", dependencies: [ .product(name: "ArgumentParser", package: "swift-argument-parser"), diff --git a/changelog.d/pr-459.build b/changelog.d/pr-459.build new file mode 100644 index 0000000000..3e3df2dda5 --- /dev/null +++ b/changelog.d/pr-459.build @@ -0,0 +1 @@ +DesignKit: Move into a sub-package as long term this package will live outside of this repo. \ No newline at end of file diff --git a/project.yml b/project.yml index 1febc6e266..3662a5d3a9 100644 --- a/project.yml +++ b/project.yml @@ -43,7 +43,7 @@ packages: exactVersion: 1.0.30-alpha # path: ../matrix-rust-sdk DesignKit: - path: ./ + path: DesignKit AnalyticsEvents: url: https://github.com/matrix-org/matrix-analytics-events branch: main