Skip to content

Commit

Permalink
Make use of the shared SwiftLint script (#39)
Browse files Browse the repository at this point in the history
* Update CI

* Update git submodule

* Update CI reference

* update submodule reference to https

* Using SSH

* Update submodule to https

* Remove submodule

* Re-add submodule

* Update CI

* Update CI to install brew

* Prepare dev dependencies

* Add explanation of // dev

* Update CI to latest version

* Fetching the organization and repo name now works

* Fix escaping chars

* Fix latest tag fetching

* Add cocoapods gem

* Use SSH and temporary disable pod_trunk_push

* Add extra documentation

* Update CI

* Fix changelog generation

* Update the readme

* Update CI

* Changelog generation updated, podspec only executed if needed

* Update CI to master

* Make use of the swiftlint script

* Update CI
  • Loading branch information
AvdLee committed Jan 28, 2020
1 parent 27aa21f commit e984416
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Mocker.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,11 @@
};
buildConfigurationList = 501E268E1F3DAE370048F39E /* Build configuration list for PBXProject "Mocker" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
mainGroup = 501E268A1F3DAE370048F39E;
productRefGroup = 501E26951F3DAE370048F39E /* Products */;
Expand Down Expand Up @@ -254,7 +254,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ -z \"$CI\" ]; then\n if which swiftlint >/dev/null; then\n swiftlint --config \"${SRCROOT}/Submodules/WeTransfer-iOS-CI/SwiftLint/.swiftlint-source.yml\"\n swiftlint --config \"${SRCROOT}/Submodules/WeTransfer-iOS-CI/SwiftLint/.swiftlint-tests.yml\"\n else\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\n fi\nfi\n";
shellScript = "./Submodules/WeTransfer-iOS-CI/SwiftLint/swiftlint.sh\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let package = Package(name: "Mocker",
// dev .package(path: "Submodules/WeTransfer-iOS-CI/Danger-Swift")
],
targets: [
.target(name: "Mocker", path: "Sources"),
// dev .target(name: "DangerDependencies", dependencies: ["Danger", "WeTransferPRLinter"], path: "Submodules/WeTransfer-iOS-CI/Danger-Swift", sources: ["DangerFakeSource.swift"])
// dev .target(name: "DangerDependencies", dependencies: ["Danger", "WeTransferPRLinter"], path: "Submodules/WeTransfer-iOS-CI/Danger-Swift", sources: ["DangerFakeSource.swift"]),
.target(name: "Mocker", path: "Sources")
],
swiftLanguageVersions: [.v5])
1 change: 0 additions & 1 deletion Sources/MockingURLProtocol.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public final class MockingURLProtocol: URLProtocol {
let response = HTTPURLResponse(url: mock.request.url!, statusCode: mock.statusCode, httpVersion: Mocker.httpVersion.rawValue, headerFields: mock.headers),
let data = mock.data(for: request)
else {
// swiftlint:disable nslog_prohibited
print("\n\n 🚨 No mocked data found for url \(String(describing: request.url?.absoluteString)) method \(String(describing: request.httpMethod)). Did you forget to use `register()`? 🚨 \n\n")
client?.urlProtocol(self, didFailWithError: Error.missingMockedData(url: String(describing: request.url?.absoluteString)))
return
Expand Down
2 changes: 1 addition & 1 deletion Submodules/WeTransfer-iOS-CI

0 comments on commit e984416

Please sign in to comment.