Skip to content

Commit e984416

Browse files
authored
Make use of the shared SwiftLint script (#39)
* 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
1 parent 27aa21f commit e984416

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

Mocker.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,11 @@
206206
};
207207
buildConfigurationList = 501E268E1F3DAE370048F39E /* Build configuration list for PBXProject "Mocker" */;
208208
compatibilityVersion = "Xcode 3.2";
209-
developmentRegion = English;
209+
developmentRegion = en;
210210
hasScannedForEncodings = 0;
211211
knownRegions = (
212-
English,
213212
en,
213+
Base,
214214
);
215215
mainGroup = 501E268A1F3DAE370048F39E;
216216
productRefGroup = 501E26951F3DAE370048F39E /* Products */;
@@ -254,7 +254,7 @@
254254
);
255255
runOnlyForDeploymentPostprocessing = 0;
256256
shellPath = /bin/sh;
257-
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";
257+
shellScript = "./Submodules/WeTransfer-iOS-CI/SwiftLint/swiftlint.sh\n";
258258
};
259259
/* End PBXShellScriptBuildPhase section */
260260

Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ let package = Package(name: "Mocker",
1919
// dev .package(path: "Submodules/WeTransfer-iOS-CI/Danger-Swift")
2020
],
2121
targets: [
22-
.target(name: "Mocker", path: "Sources"),
23-
// dev .target(name: "DangerDependencies", dependencies: ["Danger", "WeTransferPRLinter"], path: "Submodules/WeTransfer-iOS-CI/Danger-Swift", sources: ["DangerFakeSource.swift"])
22+
// dev .target(name: "DangerDependencies", dependencies: ["Danger", "WeTransferPRLinter"], path: "Submodules/WeTransfer-iOS-CI/Danger-Swift", sources: ["DangerFakeSource.swift"]),
23+
.target(name: "Mocker", path: "Sources")
2424
],
2525
swiftLanguageVersions: [.v5])

Sources/MockingURLProtocol.swift

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public final class MockingURLProtocol: URLProtocol {
3535
let response = HTTPURLResponse(url: mock.request.url!, statusCode: mock.statusCode, httpVersion: Mocker.httpVersion.rawValue, headerFields: mock.headers),
3636
let data = mock.data(for: request)
3737
else {
38-
// swiftlint:disable nslog_prohibited
3938
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")
4039
client?.urlProtocol(self, didFailWithError: Error.missingMockedData(url: String(describing: request.url?.absoluteString)))
4140
return

0 commit comments

Comments
 (0)