From e1c8c8f5f49c3deeec86c782d7f466d7ad8f0338 Mon Sep 17 00:00:00 2001 From: Frizlab Date: Mon, 10 May 2021 07:50:23 +0200 Subject: [PATCH 1/2] Make compilation of project possible in Homebrew --- .gitignore | 4 + Makefile | 6 +- Package.resolved | 61 +++ Package.swift | 29 ++ tmignore.xcodeproj/project.pbxproj | 428 ------------------ .../xcshareddata/xcschemes/tmignore.xcscheme | 84 ---- 6 files changed, 99 insertions(+), 513 deletions(-) create mode 100644 Package.resolved create mode 100644 Package.swift delete mode 100644 tmignore.xcodeproj/project.pbxproj delete mode 100644 tmignore.xcodeproj/xcshareddata/xcschemes/tmignore.xcscheme diff --git a/.gitignore b/.gitignore index 96fb6c3..4e8fe30 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,7 @@ bin/ # Xcode project.xcworkspace/ xcuserdata/ + +# SPM +.build/ +.swiftpm/ diff --git a/Makefile b/Makefile index c09053a..00055e8 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ .PHONY: build build: - xcodebuild archive -derivedDataPath $(shell mktemp -d) -scheme tmignore + swift build -c release + +.PHONY: build-in-homebrew +build-in-homebrew: + swift build -c release --disable-sandbox diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000..8f6b983 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,61 @@ +{ + "object": { + "pins": [ + { + "package": "HeliumLogger", + "repositoryURL": "https://github.com/IBM-Swift/HeliumLogger.git", + "state": { + "branch": null, + "revision": "55fd2f0b70793017acee853c53cfcf8da0bd8d8d", + "version": "1.9.200" + } + }, + { + "package": "LoggerAPI", + "repositoryURL": "https://github.com/Kitura/LoggerAPI.git", + "state": { + "branch": null, + "revision": "e82d34eab3f0b05391082b11ea07d3b70d2f65bb", + "version": "1.9.200" + } + }, + { + "package": "SwiftExec", + "repositoryURL": "https://github.com/samuelmeuli/swift-exec.git", + "state": { + "branch": null, + "revision": "4b0c2efb84a56c8885dc39209721fb92e4de0a87", + "version": "0.1.1" + } + }, + { + "package": "swift-log", + "repositoryURL": "https://github.com/apple/swift-log.git", + "state": { + "branch": null, + "revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7", + "version": "1.4.2" + } + }, + { + "package": "SwiftCLI", + "repositoryURL": "https://github.com/jakeheis/SwiftCLI.git", + "state": { + "branch": null, + "revision": "2816678bcc37f4833d32abeddbdf5e757fa891d8", + "version": "6.0.2" + } + }, + { + "package": "SwiftyJSON", + "repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON.git", + "state": { + "branch": null, + "revision": "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07", + "version": "5.0.1" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..5ccd0fe --- /dev/null +++ b/Package.swift @@ -0,0 +1,29 @@ +// swift-tools-version:5.3 +import PackageDescription + + +let package = Package( + name: "clt-logger", + platforms: [ + .macOS(.v10_13) + ], + products: [ + .executable(name: "tmignore", targets: ["tmignore"]) + ], + dependencies: [ + .package( url: "https://github.com/IBM-Swift/HeliumLogger.git", from: "1.9.0"), + .package( url: "https://github.com/apple/swift-log.git", from: "1.2.0"), + .package( url: "https://github.com/jakeheis/SwiftCLI.git", from: "6.0.1"), + .package(name: "SwiftExec", url: "https://github.com/samuelmeuli/swift-exec.git", from: "0.1.1"), + .package( url: "https://github.com/SwiftyJSON/SwiftyJSON.git", from: "5.0.0"), + ], + targets: [ + .target(name: "tmignore", dependencies: [ + .product(name: "HeliumLogger", package: "HeliumLogger"), + .product(name: "Logging", package: "swift-log"), + .product(name: "SwiftCLI", package: "SwiftCLI"), + .product(name: "SwiftExec", package: "SwiftExec"), + .product(name: "SwiftyJSON", package: "SwiftyJSON"), + ], path: "tmignore"), + ] +) diff --git a/tmignore.xcodeproj/project.pbxproj b/tmignore.xcodeproj/project.pbxproj deleted file mode 100644 index 11fe97b..0000000 --- a/tmignore.xcodeproj/project.pbxproj +++ /dev/null @@ -1,428 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 52; - objects = { - -/* Begin PBXBuildFile section */ - 7E53C0EB2459811A001E9D86 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E53C0E424598119001E9D86 /* main.swift */; }; - 7E53C0EC2459811A001E9D86 /* Git.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E53C0E52459811A001E9D86 /* Git.swift */; }; - 7E53C0ED2459811A001E9D86 /* logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E53C0E62459811A001E9D86 /* logging.swift */; }; - 7E53C0EE2459811A001E9D86 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E53C0E72459811A001E9D86 /* Config.swift */; }; - 7E53C0EF2459811A001E9D86 /* utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E53C0E82459811A001E9D86 /* utils.swift */; }; - 7E53C0F02459811A001E9D86 /* TimeMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E53C0E92459811A001E9D86 /* TimeMachine.swift */; }; - 7E53C0F12459811A001E9D86 /* Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E53C0EA2459811A001E9D86 /* Cache.swift */; }; - 7E53C0F424598176001E9D86 /* HeliumLogger in Frameworks */ = {isa = PBXBuildFile; productRef = 7E53C0F324598176001E9D86 /* HeliumLogger */; }; - 7E53C0F724598194001E9D86 /* Logging in Frameworks */ = {isa = PBXBuildFile; productRef = 7E53C0F624598194001E9D86 /* Logging */; }; - 7E53C0FA245981A7001E9D86 /* SwiftCLI in Frameworks */ = {isa = PBXBuildFile; productRef = 7E53C0F9245981A7001E9D86 /* SwiftCLI */; }; - 7E53C0FD245981B9001E9D86 /* SwiftExec in Frameworks */ = {isa = PBXBuildFile; productRef = 7E53C0FC245981B9001E9D86 /* SwiftExec */; }; - 7E53C100245981C9001E9D86 /* SwiftyJSON in Frameworks */ = {isa = PBXBuildFile; productRef = 7E53C0FF245981C9001E9D86 /* SwiftyJSON */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - 7E53C0D824598090001E9D86 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 7E53C0DA24598090001E9D86 /* tmignore */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = tmignore; sourceTree = BUILT_PRODUCTS_DIR; }; - 7E53C0E424598119001E9D86 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; - 7E53C0E52459811A001E9D86 /* Git.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Git.swift; sourceTree = ""; }; - 7E53C0E62459811A001E9D86 /* logging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = logging.swift; sourceTree = ""; }; - 7E53C0E72459811A001E9D86 /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = ""; }; - 7E53C0E82459811A001E9D86 /* utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = utils.swift; sourceTree = ""; }; - 7E53C0E92459811A001E9D86 /* TimeMachine.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TimeMachine.swift; sourceTree = ""; }; - 7E53C0EA2459811A001E9D86 /* Cache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cache.swift; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 7E53C0D724598090001E9D86 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 7E53C0FA245981A7001E9D86 /* SwiftCLI in Frameworks */, - 7E53C0F724598194001E9D86 /* Logging in Frameworks */, - 7E53C0F424598176001E9D86 /* HeliumLogger in Frameworks */, - 7E53C100245981C9001E9D86 /* SwiftyJSON in Frameworks */, - 7E53C0FD245981B9001E9D86 /* SwiftExec in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 7E53C0D124598090001E9D86 = { - isa = PBXGroup; - children = ( - 7E53C0DC24598090001E9D86 /* tmignore */, - 7E53C0DB24598090001E9D86 /* Products */, - ); - sourceTree = ""; - tabWidth = 2; - }; - 7E53C0DB24598090001E9D86 /* Products */ = { - isa = PBXGroup; - children = ( - 7E53C0DA24598090001E9D86 /* tmignore */, - ); - name = Products; - sourceTree = ""; - }; - 7E53C0DC24598090001E9D86 /* tmignore */ = { - isa = PBXGroup; - children = ( - 7E53C0E424598119001E9D86 /* main.swift */, - 7E53C0EA2459811A001E9D86 /* Cache.swift */, - 7E53C0E72459811A001E9D86 /* Config.swift */, - 7E53C0E52459811A001E9D86 /* Git.swift */, - 7E53C0E62459811A001E9D86 /* logging.swift */, - 7E53C0E92459811A001E9D86 /* TimeMachine.swift */, - 7E53C0E82459811A001E9D86 /* utils.swift */, - ); - path = tmignore; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 7E53C0D924598090001E9D86 /* tmignore */ = { - isa = PBXNativeTarget; - buildConfigurationList = 7E53C0E124598090001E9D86 /* Build configuration list for PBXNativeTarget "tmignore" */; - buildPhases = ( - 7E53C0D624598090001E9D86 /* Sources */, - 7E53C0D724598090001E9D86 /* Frameworks */, - 7E53C0D824598090001E9D86 /* CopyFiles */, - 7E631AB8245994D100DB87AB /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = tmignore; - packageProductDependencies = ( - 7E53C0F324598176001E9D86 /* HeliumLogger */, - 7E53C0F624598194001E9D86 /* Logging */, - 7E53C0F9245981A7001E9D86 /* SwiftCLI */, - 7E53C0FC245981B9001E9D86 /* SwiftExec */, - 7E53C0FF245981C9001E9D86 /* SwiftyJSON */, - ); - productName = tmignore; - productReference = 7E53C0DA24598090001E9D86 /* tmignore */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 7E53C0D224598090001E9D86 /* Project object */ = { - isa = PBXProject; - attributes = { - LastSwiftUpdateCheck = 1140; - LastUpgradeCheck = 1140; - ORGANIZATIONNAME = "Samuel Meuli"; - TargetAttributes = { - 7E53C0D924598090001E9D86 = { - CreatedOnToolsVersion = 11.4.1; - }; - }; - }; - buildConfigurationList = 7E53C0D524598090001E9D86 /* Build configuration list for PBXProject "tmignore" */; - compatibilityVersion = "Xcode 11.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 7E53C0D124598090001E9D86; - packageReferences = ( - 7E53C0F224598176001E9D86 /* XCRemoteSwiftPackageReference "HeliumLogger" */, - 7E53C0F524598194001E9D86 /* XCRemoteSwiftPackageReference "swift-log" */, - 7E53C0F8245981A7001E9D86 /* XCRemoteSwiftPackageReference "SwiftCLI" */, - 7E53C0FB245981B9001E9D86 /* XCRemoteSwiftPackageReference "swift-exec" */, - 7E53C0FE245981C9001E9D86 /* XCRemoteSwiftPackageReference "SwiftyJSON" */, - ); - productRefGroup = 7E53C0DB24598090001E9D86 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 7E53C0D924598090001E9D86 /* tmignore */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXShellScriptBuildPhase section */ - 7E631AB8245994D100DB87AB /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "mkdir -p \"bin\" && cp \"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_NAME}\" \"bin/${EXECUTABLE_NAME}\"\n"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 7E53C0D624598090001E9D86 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 7E53C0EB2459811A001E9D86 /* main.swift in Sources */, - 7E53C0F12459811A001E9D86 /* Cache.swift in Sources */, - 7E53C0EE2459811A001E9D86 /* Config.swift in Sources */, - 7E53C0EF2459811A001E9D86 /* utils.swift in Sources */, - 7E53C0EC2459811A001E9D86 /* Git.swift in Sources */, - 7E53C0ED2459811A001E9D86 /* logging.swift in Sources */, - 7E53C0F02459811A001E9D86 /* TimeMachine.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 7E53C0DF24598090001E9D86 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = Debug; - }; - 7E53C0E024598090001E9D86 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.13; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = macosx; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - }; - name = Release; - }; - 7E53C0E224598090001E9D86 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 7E53C0E324598090001E9D86 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 7E53C0D524598090001E9D86 /* Build configuration list for PBXProject "tmignore" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7E53C0DF24598090001E9D86 /* Debug */, - 7E53C0E024598090001E9D86 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 7E53C0E124598090001E9D86 /* Build configuration list for PBXNativeTarget "tmignore" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 7E53C0E224598090001E9D86 /* Debug */, - 7E53C0E324598090001E9D86 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 7E53C0F224598176001E9D86 /* XCRemoteSwiftPackageReference "HeliumLogger" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/IBM-Swift/HeliumLogger"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.9.0; - }; - }; - 7E53C0F524598194001E9D86 /* XCRemoteSwiftPackageReference "swift-log" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/apple/swift-log"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 1.2.0; - }; - }; - 7E53C0F8245981A7001E9D86 /* XCRemoteSwiftPackageReference "SwiftCLI" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/jakeheis/SwiftCLI"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 6.0.1; - }; - }; - 7E53C0FB245981B9001E9D86 /* XCRemoteSwiftPackageReference "swift-exec" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/samuelmeuli/swift-exec"; - requirement = { - kind = upToNextMinorVersion; - minimumVersion = 0.1.1; - }; - }; - 7E53C0FE245981C9001E9D86 /* XCRemoteSwiftPackageReference "SwiftyJSON" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/SwiftyJSON/SwiftyJSON"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 5.0.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 7E53C0F324598176001E9D86 /* HeliumLogger */ = { - isa = XCSwiftPackageProductDependency; - package = 7E53C0F224598176001E9D86 /* XCRemoteSwiftPackageReference "HeliumLogger" */; - productName = HeliumLogger; - }; - 7E53C0F624598194001E9D86 /* Logging */ = { - isa = XCSwiftPackageProductDependency; - package = 7E53C0F524598194001E9D86 /* XCRemoteSwiftPackageReference "swift-log" */; - productName = Logging; - }; - 7E53C0F9245981A7001E9D86 /* SwiftCLI */ = { - isa = XCSwiftPackageProductDependency; - package = 7E53C0F8245981A7001E9D86 /* XCRemoteSwiftPackageReference "SwiftCLI" */; - productName = SwiftCLI; - }; - 7E53C0FC245981B9001E9D86 /* SwiftExec */ = { - isa = XCSwiftPackageProductDependency; - package = 7E53C0FB245981B9001E9D86 /* XCRemoteSwiftPackageReference "swift-exec" */; - productName = SwiftExec; - }; - 7E53C0FF245981C9001E9D86 /* SwiftyJSON */ = { - isa = XCSwiftPackageProductDependency; - package = 7E53C0FE245981C9001E9D86 /* XCRemoteSwiftPackageReference "SwiftyJSON" */; - productName = SwiftyJSON; - }; -/* End XCSwiftPackageProductDependency section */ - }; - rootObject = 7E53C0D224598090001E9D86 /* Project object */; -} diff --git a/tmignore.xcodeproj/xcshareddata/xcschemes/tmignore.xcscheme b/tmignore.xcodeproj/xcshareddata/xcschemes/tmignore.xcscheme deleted file mode 100644 index 4ccf00c..0000000 --- a/tmignore.xcodeproj/xcshareddata/xcschemes/tmignore.xcscheme +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From abc836fa9849b02208dfbdceb4a9529df8c021ce Mon Sep 17 00:00:00 2001 From: Frizlab Date: Mon, 10 May 2021 07:58:22 +0200 Subject: [PATCH 2/2] Make sure to use version in Package.resolved when building --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 00055e8..b5d9fca 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: build build: - swift build -c release + swift build -c release --force-resolved-versions .PHONY: build-in-homebrew build-in-homebrew: - swift build -c release --disable-sandbox + swift build -c release --force-resolved-versions --disable-sandbox