From 08ab02693566c66176b5bf33c7875c9622c8fcf6 Mon Sep 17 00:00:00 2001 From: Guillaume Bourachot Date: Tue, 26 May 2020 09:26:26 +0200 Subject: [PATCH 1/3] Addition of the Package.swift file --- Package.swift | 16 ++++++++++++++++ SwiftTypes.xcodeproj/project.pbxproj | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..2988a9c --- /dev/null +++ b/Package.swift @@ -0,0 +1,16 @@ +// swift-tools-version:4.0 + +import PackageDescription + +let pkg = Package(name: "SwiftTypes") +pkg.products = [ + .library(name: "SwiftTypes", targets: ["SwiftTypes"]), +] + +let pmk: Target = .target(name: "SwiftTypes") +pmk.path = "SwiftTypes" +pkg.swiftLanguageVersions = [5] +pkg.targets = [ + pmk, + .testTarget(name: "SwiftTypesTests", dependencies: ["SwiftTypes"]), +] diff --git a/SwiftTypes.xcodeproj/project.pbxproj b/SwiftTypes.xcodeproj/project.pbxproj index 859c6ae..07c81ef 100644 --- a/SwiftTypes.xcodeproj/project.pbxproj +++ b/SwiftTypes.xcodeproj/project.pbxproj @@ -49,6 +49,7 @@ /* Begin PBXFileReference section */ 0059A84B1C204F9400EB59BD /* SwiftTypes.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTypes.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0059A84F1C204F9400EB59BD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 27B17A32247CFB240040FD23 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = ""; }; 710CE64D1C15D9D40059C0AD /* SwiftTypes.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTypes.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 710CE6501C15D9D40059C0AD /* SwiftTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftTypes.h; sourceTree = ""; }; 710CE6521C15D9D40059C0AD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -118,6 +119,7 @@ 710CE6431C15D9D40059C0AD = { isa = PBXGroup; children = ( + 27B17A32247CFB240040FD23 /* Package.swift */, 710CE64F1C15D9D40059C0AD /* SwiftTypes */, 710CE65B1C15D9D40059C0AD /* SwiftTypesTests */, 0059A84C1C204F9400EB59BD /* SwiftTypesWatchOS */, From 1677e9b84e33ba6705bdb4518a5f6eb0f90146ea Mon Sep 17 00:00:00 2001 From: Guillaume Bourachot Date: Tue, 26 May 2020 09:33:25 +0200 Subject: [PATCH 2/3] Specify tests path --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 2988a9c..bb3ef83 100644 --- a/Package.swift +++ b/Package.swift @@ -12,5 +12,5 @@ pmk.path = "SwiftTypes" pkg.swiftLanguageVersions = [5] pkg.targets = [ pmk, - .testTarget(name: "SwiftTypesTests", dependencies: ["SwiftTypes"]), + .testTarget(name: "SwiftTypesTests", dependencies: ["SwiftTypes"], path: "SwiftTypesTests"), ] From 8df26d29f91056ba661eb8ff71e3496028ae1a25 Mon Sep 17 00:00:00 2001 From: Guillaume Bourachot Date: Fri, 5 Nov 2021 10:27:41 +0100 Subject: [PATCH 3/3] SPM support for Xcode 13 --- .../contents.xcworkspacedata | 7 +++++ .../xcschemes/xcschememanagement.plist | 27 +++++++++++++++++++ Package.swift | 4 +-- SwiftTypes.xcodeproj/project.pbxproj | 3 +++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 .swiftpm/xcode/xcuserdata/guillaumebourachot.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/.swiftpm/xcode/xcuserdata/guillaumebourachot.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/guillaumebourachot.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..a8c7efa --- /dev/null +++ b/.swiftpm/xcode/xcuserdata/guillaumebourachot.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + SwiftTypes.xcscheme_^#shared#^_ + + orderHint + 0 + + + SuppressBuildableAutocreation + + SwiftTypes + + primary + + + SwiftTypesTests + + primary + + + + + diff --git a/Package.swift b/Package.swift index bb3ef83..e6a2572 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.0 +// swift-tools-version:5.1 import PackageDescription @@ -9,7 +9,7 @@ pkg.products = [ let pmk: Target = .target(name: "SwiftTypes") pmk.path = "SwiftTypes" -pkg.swiftLanguageVersions = [5] +pkg.swiftLanguageVersions = [.v5] pkg.targets = [ pmk, .testTarget(name: "SwiftTypesTests", dependencies: ["SwiftTypes"], path: "SwiftTypesTests"), diff --git a/SwiftTypes.xcodeproj/project.pbxproj b/SwiftTypes.xcodeproj/project.pbxproj index 07c81ef..30e1521 100644 --- a/SwiftTypes.xcodeproj/project.pbxproj +++ b/SwiftTypes.xcodeproj/project.pbxproj @@ -320,6 +320,7 @@ }; 710CE6561C15D9D40059C0AD = { CreatedOnToolsVersion = 7.1.1; + DevelopmentTeam = 23A5AVAGZ8; LastSwiftMigration = 0900; }; 719156731D1D39C900FC55C9 = { @@ -662,6 +663,7 @@ 710CE6651C15D9D40059C0AD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + DEVELOPMENT_TEAM = 23A5AVAGZ8; INFOPLIST_FILE = SwiftTypesTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = kreactive.SwiftTypesTests; @@ -673,6 +675,7 @@ 710CE6661C15D9D40059C0AD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + DEVELOPMENT_TEAM = 23A5AVAGZ8; INFOPLIST_FILE = SwiftTypesTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = kreactive.SwiftTypesTests;