Skip to content

Commit

Permalink
Restructured for SwiftLint
Browse files Browse the repository at this point in the history
  • Loading branch information
@AvdLee
AvdLee committed Mar 23, 2018
1 parent 75667a2 commit fe46fb1
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 39 deletions.
80 changes: 43 additions & 37 deletions Mocker.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

/* Begin PBXBuildFile section */
501E269E1F3DAE370048F39E /* Mocker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 501E26941F3DAE370048F39E /* Mocker.framework */; };
503445DD1F3DB0F90039D5E4 /* MockerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503445D71F3DB0A60039D5E4 /* MockerTests.swift */; };
503445DE1F3DB1F00039D5E4 /* Mocker.h in Headers */ = {isa = PBXBuildFile; fileRef = 50B9281B1F3DB06500F2974A /* Mocker.h */; settings = {ATTRIBUTES = (Public, ); }; };
503446171F3DB4660039D5E4 /* Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503446141F3DB4660039D5E4 /* Mock.swift */; };
503446181F3DB4660039D5E4 /* Mocker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503446151F3DB4660039D5E4 /* Mocker.swift */; };
503446191F3DB4660039D5E4 /* MockingURLProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503446161F3DB4660039D5E4 /* MockingURLProtocol.swift */; };
503446411F3DB7AA0039D5E4 /* MockedData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 503446401F3DB7AA0039D5E4 /* MockedData.swift */; };
503446421F3DBA3A0039D5E4 /* Resources in Resources */ = {isa = PBXBuildFile; fileRef = 503446361F3DB77C0039D5E4 /* Resources */; };
50D4606E20653F1F00A85D93 /* Mocker.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D4606B20653F1F00A85D93 /* Mocker.h */; settings = {ATTRIBUTES = (Public, ); }; };
50D4607020653F2500A85D93 /* MockedData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50D4605B20653EAF00A85D93 /* MockedData.swift */; };
50D4607120653F2700A85D93 /* MockerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50D4605C20653EAF00A85D93 /* MockerTests.swift */; };
50D4607320653F4500A85D93 /* Resources in Resources */ = {isa = PBXBuildFile; fileRef = 50D4607220653F4500A85D93 /* Resources */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -30,15 +30,15 @@
/* Begin PBXFileReference section */
501E26941F3DAE370048F39E /* Mocker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Mocker.framework; sourceTree = BUILT_PRODUCTS_DIR; };
501E269D1F3DAE370048F39E /* MockerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MockerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
503445D71F3DB0A60039D5E4 /* MockerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockerTests.swift; sourceTree = "<group>"; };
503445D91F3DB0A60039D5E4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
503445E01F3DB21F0039D5E4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
503446141F3DB4660039D5E4 /* Mock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mock.swift; sourceTree = "<group>"; };
503446151F3DB4660039D5E4 /* Mocker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Mocker.swift; sourceTree = "<group>"; };
503446161F3DB4660039D5E4 /* MockingURLProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockingURLProtocol.swift; sourceTree = "<group>"; };
503446361F3DB77C0039D5E4 /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Resources; sourceTree = "<group>"; };
503446401F3DB7AA0039D5E4 /* MockedData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockedData.swift; sourceTree = "<group>"; };
50B9281B1F3DB06500F2974A /* Mocker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Mocker.h; path = Mocker/Mocker.h; sourceTree = "<group>"; };
50D4605B20653EAF00A85D93 /* MockedData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockedData.swift; sourceTree = "<group>"; };
50D4605C20653EAF00A85D93 /* MockerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockerTests.swift; sourceTree = "<group>"; };
50D4606320653EAF00A85D93 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50D4606B20653F1F00A85D93 /* Mocker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mocker.h; sourceTree = "<group>"; };
50D4606D20653F1F00A85D93 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
50D4607220653F4500A85D93 /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Resources; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -63,11 +63,10 @@
501E268A1F3DAE370048F39E = {
isa = PBXGroup;
children = (
50B9281B1F3DB06500F2974A /* Mocker.h */,
503445D51F3DB0A60039D5E4 /* MockerTests */,
501E26951F3DAE370048F39E /* Products */,
50D4606A20653F1F00A85D93 /* Mocker */,
50D4605A20653EAF00A85D93 /* MockerTests */,
503446131F3DB4660039D5E4 /* Sources */,
503445D81F3DB0A60039D5E4 /* Supporting Files */,
);
sourceTree = "<group>";
};
Expand All @@ -80,43 +79,50 @@
name = Products;
sourceTree = "<group>";
};
503445D51F3DB0A60039D5E4 /* MockerTests */ = {
503446131F3DB4660039D5E4 /* Sources */ = {
isa = PBXGroup;
children = (
503446361F3DB77C0039D5E4 /* Resources */,
503445DF1F3DB21F0039D5E4 /* Supporting Files */,
503445D71F3DB0A60039D5E4 /* MockerTests.swift */,
503446401F3DB7AA0039D5E4 /* MockedData.swift */,
503446141F3DB4660039D5E4 /* Mock.swift */,
503446151F3DB4660039D5E4 /* Mocker.swift */,
503446161F3DB4660039D5E4 /* MockingURLProtocol.swift */,
);
name = MockerTests;
path = Mocker/MockerTests;
path = Sources;
sourceTree = "<group>";
};
503445D81F3DB0A60039D5E4 /* Supporting Files */ = {
50D4605A20653EAF00A85D93 /* MockerTests */ = {
isa = PBXGroup;
children = (
503445D91F3DB0A60039D5E4 /* Info.plist */,
50D4605B20653EAF00A85D93 /* MockedData.swift */,
50D4605C20653EAF00A85D93 /* MockerTests.swift */,
50D4607220653F4500A85D93 /* Resources */,
50D4606220653EAF00A85D93 /* Supporting Files */,
);
name = "Supporting Files";
path = "Mocker/Supporting Files";
path = MockerTests;
sourceTree = "<group>";
};
503445DF1F3DB21F0039D5E4 /* Supporting Files */ = {
50D4606220653EAF00A85D93 /* Supporting Files */ = {
isa = PBXGroup;
children = (
503445E01F3DB21F0039D5E4 /* Info.plist */,
50D4606320653EAF00A85D93 /* Info.plist */,
);
path = "Supporting Files";
sourceTree = "<group>";
};
503446131F3DB4660039D5E4 /* Sources */ = {
50D4606A20653F1F00A85D93 /* Mocker */ = {
isa = PBXGroup;
children = (
503446141F3DB4660039D5E4 /* Mock.swift */,
503446151F3DB4660039D5E4 /* Mocker.swift */,
503446161F3DB4660039D5E4 /* MockingURLProtocol.swift */,
50D4606B20653F1F00A85D93 /* Mocker.h */,
50D4606C20653F1F00A85D93 /* Supporting Files */,
);
path = Sources;
path = Mocker;
sourceTree = "<group>";
};
50D4606C20653F1F00A85D93 /* Supporting Files */ = {
isa = PBXGroup;
children = (
50D4606D20653F1F00A85D93 /* Info.plist */,
);
path = "Supporting Files";
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -126,7 +132,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
503445DE1F3DB1F00039D5E4 /* Mocker.h in Headers */,
50D4606E20653F1F00A85D93 /* Mocker.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -224,7 +230,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
503446421F3DBA3A0039D5E4 /* Resources in Resources */,
50D4607320653F4500A85D93 /* Resources in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -262,8 +268,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
503446411F3DB7AA0039D5E4 /* MockedData.swift in Sources */,
503445DD1F3DB0F90039D5E4 /* MockerTests.swift in Sources */,
50D4607120653F2700A85D93 /* MockerTests.swift in Sources */,
50D4607020653F2500A85D93 /* MockedData.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -436,7 +442,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
DEVELOPMENT_TEAM = GLJTT4T544;
INFOPLIST_FILE = "Mocker/MockerTests/Supporting Files/Info.plist";
INFOPLIST_FILE = "MockerTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wetransfer.MockerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -448,7 +454,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
DEVELOPMENT_TEAM = GLJTT4T544;
INFOPLIST_FILE = "Mocker/MockerTests/Supporting Files/Info.plist";
INFOPLIST_FILE = "MockerTests/Supporting Files/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.wetransfer.MockerTests;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
0 Mocker/MockerTests/MockedData.swift → MockerTests/MockedData.swift
View file
File renamed without changes.
1 change: 0 additions & 1 deletion Mocker/MockerTests/MockerTests.swift → MockerTests/MockerTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ final class MockerTests: XCTestCase {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
task.cancel()
})

waitForExpectations(timeout: 10.0, handler: nil)
}

Expand Down
0 ...erTests/Resources/JSON Files/example.json → ...erTests/Resources/JSON Files/example.json
View file
File renamed without changes.
0 ...rTests/Resources/sample-redirect-get.data → ...rTests/Resources/sample-redirect-get.data
View file
File renamed without changes.
0 ...Tests/Resources/wetransfer_bot_avater.png → ...Tests/Resources/wetransfer_bot_avater.png
View file
File renamed without changes
0 ...r/MockerTests/Supporting Files/Info.plist → MockerTests/Supporting Files/Info.plist
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Submodules/WeTransfer-iOS-CI
Submodule WeTransfer-iOS-CI updated 2 files
+1 −1 Fastlane/Fastfile
+2 −1 SwiftLint/.swiftlint-tests.yml

0 comments on commit fe46fb1

Please sign in to comment.