From 3c4df8e88c5747cac636ad5142864992ccd215ee Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Sat, 23 Oct 2021 19:10:37 +0100 Subject: [PATCH 1/7] Create GitHub Action CI file --- .github/workflows/swift.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/workflows/swift.yml diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml new file mode 100644 index 0000000..a2972fe --- /dev/null +++ b/.github/workflows/swift.yml @@ -0,0 +1,15 @@ +name: CI + +on: [pull_request] + +jobs: + build: + runs-on: macos-11 + steps: + - uses: actions/checkout@v2 + - run: gem install bundler + - run: bundle install + - run: npm install -g danger + - run: swift package generate-xcodeproj + - run: xcodebuild test -scheme DangerSwiftCoverage-Package -derivedDataPath build/ -enableCodeCoverage YES | XCPRETTY_JSON_FILE_OUTPUT=result.json xcpretty -f `xcpretty-json-formatter` + - run: DEBUG="*" swift run danger-swift ci From 8c127718a3e2715024aafca36c32da50edd9147e Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Sat, 23 Oct 2021 19:15:55 +0100 Subject: [PATCH 2/7] Update swift.yml --- .github/workflows/swift.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index a2972fe..a64b7af 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -13,3 +13,5 @@ jobs: - run: swift package generate-xcodeproj - run: xcodebuild test -scheme DangerSwiftCoverage-Package -derivedDataPath build/ -enableCodeCoverage YES | XCPRETTY_JSON_FILE_OUTPUT=result.json xcpretty -f `xcpretty-json-formatter` - run: DEBUG="*" swift run danger-swift ci + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From b7cc309928a3b0a0a83e2e35fcdbfc0d8dd22d9d Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Sat, 23 Oct 2021 19:25:39 +0100 Subject: [PATCH 3/7] Update dependencies --- Package.resolved | 104 ++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 70 deletions(-) diff --git a/Package.resolved b/Package.resolved index b8eecb2..3cb97f3 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,40 +1,13 @@ { "object": { "pins": [ - { - "package": "Commandant", - "repositoryURL": "https://github.com/Carthage/Commandant.git", - "state": { - "branch": null, - "revision": "ab68611013dec67413628ac87c1f29e8427bc8e4", - "version": "0.17.0" - } - }, - { - "package": "CwlCatchException", - "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git", - "state": { - "branch": null, - "revision": "7cd2f8cacc4d22f21bc0b2309c3b18acf7957b66", - "version": "1.2.0" - } - }, - { - "package": "CwlPreconditionTesting", - "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git", - "state": { - "branch": null, - "revision": "c228db5d2ad1b01ebc84435e823e6cca4e3db98b", - "version": "1.2.0" - } - }, { "package": "DangerXCodeSummary", "repositoryURL": "https://github.com/f-meloni/danger-swift-xcodesummary", "state": { "branch": null, - "revision": "742e2854a1693ddb7f511ca7a4e6206b12103b20", - "version": "1.1.0" + "revision": "289d5136cead3d4b1eae509acc3f0b044252fc6c", + "version": "1.2.1" } }, { @@ -42,8 +15,8 @@ "repositoryURL": "https://github.com/orta/Komondor", "state": { "branch": null, - "revision": "3cd6d76887816ead5931ddbfb249c2935f518e17", - "version": "1.0.4" + "revision": "7c3c6040c01c99b83afc7eaa8f2a8a69337f659a", + "version": "1.1.1" } }, { @@ -55,40 +28,22 @@ "version": "0.2.3" } }, - { - "package": "Nimble", - "repositoryURL": "https://github.com/Quick/Nimble.git", - "state": { - "branch": null, - "revision": "b02b00b30b6353632aa4a5fb6124f8147f7140c0", - "version": "8.0.5" - } - }, { "package": "OctoKit", "repositoryURL": "https://github.com/nerdishbynature/octokit.swift", "state": { "branch": null, - "revision": "9ad4d6eff94ad1d9873d3b410a47c663c820d4bd", - "version": "0.10.0" + "revision": "9521cdff919053868ab13cd08a228f7bc1bde2a9", + "version": "0.11.0" } }, { "package": "PackageConfig", - "repositoryURL": "https://github.com/shibapm/PackageConfig", - "state": { - "branch": null, - "revision": "bf90dc69fa0792894b08a0b74cf34029694ae486", - "version": "0.13.0" - } - }, - { - "package": "Quick", - "repositoryURL": "https://github.com/Quick/Quick.git", + "repositoryURL": "https://github.com/shibapm/PackageConfig.git", "state": { "branch": null, - "revision": "33682c2f6230c60614861dfc61df267e11a1602f", - "version": "2.2.0" + "revision": "84d4d70de31a797ca54abee47816cdafba36d290", + "version": "1.0.2" } }, { @@ -105,8 +60,8 @@ "repositoryURL": "https://github.com/f-meloni/Rocket", "state": { "branch": null, - "revision": "623cb4ccf55d708d082516ccd5cfea3dac8f9032", - "version": "1.0.0" + "revision": "9880a5beb7fcb9e61ddd5764edc1700b8c418deb", + "version": "1.2.1" } }, { @@ -123,8 +78,8 @@ "repositoryURL": "https://github.com/jpsim/SourceKitten.git", "state": { "branch": null, - "revision": "97b5848e5692150d75b5cf0b81d7ebef5f4d5071", - "version": "0.28.0" + "revision": "558628392eb31d37cb251cfe626c53eafd330df6", + "version": "0.31.1" } }, { @@ -132,8 +87,17 @@ "repositoryURL": "https://github.com/danger/swift.git", "state": { "branch": null, - "revision": "9abfbf269f7b1d4bb799ca8f52620180d63d953e", - "version": "3.0.0" + "revision": "ac99660abd8253b97f4d73e8ed756f347196d14a", + "version": "3.12.1" + } + }, + { + "package": "swift-argument-parser", + "repositoryURL": "https://github.com/apple/swift-argument-parser.git", + "state": { + "branch": null, + "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b", + "version": "1.0.1" } }, { @@ -141,8 +105,8 @@ "repositoryURL": "https://github.com/nicklockwood/SwiftFormat", "state": { "branch": null, - "revision": "d9b7cf39e06e89428004a767d97006fb6d293c53", - "version": "0.43.5" + "revision": "3c33b468d5c15b6f916b2b4c55a9a3105674c62d", + "version": "0.48.17" } }, { @@ -150,8 +114,8 @@ "repositoryURL": "https://github.com/Realm/SwiftLint", "state": { "branch": null, - "revision": "76d44cff391645a7f4d5ba2bf1853afaf3f5c1fb", - "version": "0.38.2" + "revision": "99465e659fb91facab5b1d3c0f9229176d086bf1", + "version": "0.45.0" } }, { @@ -159,8 +123,8 @@ "repositoryURL": "https://github.com/kareman/SwiftShell", "state": { "branch": null, - "revision": "fb7fc2c9ad8811caf324431a508fb79e3fb74f99", - "version": "5.0.1" + "revision": "a6014fe94c3dbff0ad500e8da4f251a5d336530b", + "version": "5.1.0-beta.1" } }, { @@ -177,8 +141,8 @@ "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git", "state": { "branch": null, - "revision": "a4931e5c3bafbedeb1601d3bb76bbe835c6d475a", - "version": "5.0.1" + "revision": "9183170d20857753d4f331b0ca63f73c60764bf3", + "version": "5.0.2" } }, { @@ -195,8 +159,8 @@ "repositoryURL": "https://github.com/jpsim/Yams", "state": { "branch": null, - "revision": "c947a306d2e80ecb2c0859047b35c73b8e1ca27f", - "version": "2.0.0" + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" } } ] From 4bbd45e95719658eec236ddf330d7beba0321031 Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Sat, 23 Oct 2021 19:34:35 +0100 Subject: [PATCH 4/7] Update swift version --- .../contents.xcworkspacedata | 7 ++ .../UserInterfaceState.xcuserstate | Bin 0 -> 11563 bytes .../xcschemes/xcschememanagement.plist | 66 ++++++++++++++++++ Package.swift | 18 +++-- .../XcodeBuild/XcresultBundleFinder.swift | 5 +- 5 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata create mode 100644 .swiftpm/xcode/package.xcworkspace/xcuserdata/franco.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 .swiftpm/xcode/xcuserdata/franco.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/package.xcworkspace/xcuserdata/franco.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/franco.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..2700ac63a3e65704d22319ab973d10b879963370 GIT binary patch literal 11563 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 Vxkj}`gB%flnc7%*6Mjc^{2!xFgUbK_ literal 0 HcmV?d00001 diff --git a/.swiftpm/xcode/xcuserdata/franco.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/franco.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..e4a732d --- /dev/null +++ b/.swiftpm/xcode/xcuserdata/franco.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,66 @@ + + + + + SchemeUserState + + DangerDeps.xcscheme_^#shared#^_ + + orderHint + 1 + + DangerSwiftCoverage-Package.xcscheme_^#shared#^_ + + orderHint + 0 + + DangerSwiftCoverage.xcscheme_^#shared#^_ + + orderHint + 2 + + SWXMLHashPlayground (Playground) 1.xcscheme + + isShown + + orderHint + 5 + + SWXMLHashPlayground (Playground) 2.xcscheme + + isShown + + orderHint + 6 + + SWXMLHashPlayground (Playground).xcscheme + + isShown + + orderHint + 4 + + Test area (Playground) 1.xcscheme + + isShown + + orderHint + 8 + + Test area (Playground) 2.xcscheme + + isShown + + orderHint + 9 + + Test area (Playground).xcscheme + + isShown + + orderHint + 7 + + + + diff --git a/Package.swift b/Package.swift index e2be8da..44cbee1 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.3 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -14,23 +14,29 @@ let package = Package( .library(name: "DangerDeps", type: .dynamic, targets: ["DangerDependencies"]), // dev ], dependencies: [ - .package(url: "https://github.com/danger/swift.git", from: "3.0.0"), + .package(name: "danger-swift", url: "https://github.com/danger/swift.git", from: "3.0.0"), // Dev dependencies .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.35.8"), // dev .package(url: "https://github.com/Realm/SwiftLint", from: "0.28.1"), // dev .package(url: "https://github.com/f-meloni/Rocket", from: "1.0.0"), // dev .package(url: "https://github.com/orta/Komondor", from: "1.0.0"), // dev - .package(url: "https://github.com/f-meloni/danger-swift-xcodesummary", from: "1.0.0"), // dev + .package(name: "DangerXCodeSummary", url: "https://github.com/f-meloni/danger-swift-xcodesummary", from: "1.0.0"), // dev ], targets: [ - .target(name: "DangerDependencies", dependencies: ["Danger", "DangerSwiftCoverage", "DangerXCodeSummary"]), // dev + .target(name: "DangerDependencies", dependencies: [ + .product(name: "Danger", package: "danger-swift"), + "DangerSwiftCoverage", + "DangerXCodeSummary", + ]), // dev .target( name: "DangerSwiftCoverage", - dependencies: ["Danger"] + dependencies: [ + .product(name: "Danger", package: "danger-swift"), + ] ), .testTarget( name: "DangerSwiftCoverageTests", - dependencies: ["DangerSwiftCoverage", "DangerFixtures"] + dependencies: ["DangerSwiftCoverage", .product(name: "DangerFixtures", package: "danger-swift")] ), ] ) diff --git a/Sources/DangerSwiftCoverage/XcodeBuild/XcresultBundleFinder.swift b/Sources/DangerSwiftCoverage/XcodeBuild/XcresultBundleFinder.swift index bc3fd92..21a10fe 100644 --- a/Sources/DangerSwiftCoverage/XcodeBuild/XcresultBundleFinder.swift +++ b/Sources/DangerSwiftCoverage/XcodeBuild/XcresultBundleFinder.swift @@ -17,11 +17,12 @@ enum XcresultBundleFinder: XcresultBundleFinding { let testFolder = derivedDataFolder + "/Logs/Test/" guard let xcresults = try? fileManager.contentsOfDirectory(atPath: testFolder).filter({ $0.split(separator: ".").last == "xcresult" }), - !xcresults.isEmpty else { + !xcresults.isEmpty + else { throw Errors.xcresultNotFound } - let xcresult = testFolder + xcresults.sorted(by: { (left, right) -> Bool in + let xcresult = testFolder + xcresults.sorted(by: { left, right -> Bool in let leftModificationDate = fileManager.modificationDate(forFileAtPath: testFolder + left)?.timeIntervalSince1970 ?? 0 let rightModificationDate = fileManager.modificationDate(forFileAtPath: testFolder + right)?.timeIntervalSince1970 ?? 0 From 6c08ae2f23d4e16b5c132ed621488e07637083b0 Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Mon, 25 Oct 2021 14:35:45 +0100 Subject: [PATCH 5/7] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 44cbee1..d375409 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.5 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription From 346a8546cc9537572b17b061cb0bc36d60fd9303 Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Mon, 25 Oct 2021 14:39:40 +0100 Subject: [PATCH 6/7] Update xcodebuild --- .github/workflows/swift.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index a64b7af..829a2f5 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -10,8 +10,7 @@ jobs: - run: gem install bundler - run: bundle install - run: npm install -g danger - - run: swift package generate-xcodeproj - - run: xcodebuild test -scheme DangerSwiftCoverage-Package -derivedDataPath build/ -enableCodeCoverage YES | XCPRETTY_JSON_FILE_OUTPUT=result.json xcpretty -f `xcpretty-json-formatter` + - run: set -o pipefail env NSUnbufferedIO=YES xcodebuild -scheme DangerSwiftCoverage-Package -enableCodeCoverage YES -derivedDataPath build/ build test | XCPRETTY_JSON_FILE_OUTPUT=result.json xcpretty -f `xcpretty-json-formatter` - run: DEBUG="*" swift run danger-swift ci env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From da378c698c76c2e1e3f47aee7c87496b5c3ef045 Mon Sep 17 00:00:00 2001 From: Franco Meloni Date: Mon, 25 Oct 2021 14:48:21 +0100 Subject: [PATCH 7/7] Update swift.yml --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 829a2f5..d421623 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -10,7 +10,7 @@ jobs: - run: gem install bundler - run: bundle install - run: npm install -g danger - - run: set -o pipefail env NSUnbufferedIO=YES xcodebuild -scheme DangerSwiftCoverage-Package -enableCodeCoverage YES -derivedDataPath build/ build test | XCPRETTY_JSON_FILE_OUTPUT=result.json xcpretty -f `xcpretty-json-formatter` + - run: set -o pipefail env NSUnbufferedIO=YES xcodebuild -scheme DangerSwiftCoverage-Package -destination 'platform=macOS' -clonedSourcePackagesDirPath ~/.build -enableCodeCoverage YES -derivedDataPath build/ build test | XCPRETTY_JSON_FILE_OUTPUT=result.json xcpretty -f `xcpretty-json-formatter` - run: DEBUG="*" swift run danger-swift ci env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}