Skip to content

Commit 189fa40

Browse files
balavorbalavor
committed
Merge fix-for-cocoapods into master
2 parents c487c59 + 0f81d7a commit 189fa40

30 files changed

+38
-33
lines changed

‎.swift-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
4.1

‎SnappyShrimp.podspec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
33
s.version = '1.6'
44
s.summary = 'New experience of Snapshot testing'
55
s.platform = :ios
6-
s.swift_version = '4.0'
6+
s.swift_version = '4.1'
77
s.description = <<-DESC
88
A new, faster way of Snapshot testing. Helps to verify that your view and its layout looks exactly as you expect on all devices, in all orientations, including iPad multitasking mode support and iPhone X support with its specific design.
99
DESC
@@ -16,7 +16,8 @@ A new, faster way of Snapshot testing. Helps to verify that your view and its la
1616

1717
s.ios.deployment_target = '9.0'
1818

19-
s.source_files = 'SnappyShrimp/*'
19+
s.source_files = 'SnappyShrimp/Sources/**/*'
20+
s.resources = 'SnappyShrimp/Media.xcassets'
2021
s.frameworks = 'UIKit', 'XCTest'
2122
s.dependency 'FBSnapshotTestCase', '~> 2.1.4'
2223
end

‎SnappyShrimp.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -56,39 +56,39 @@
5656
0614E90E206853610068F863 /* SnappyShrimp.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SnappyShrimp.podspec; sourceTree = SOURCE_ROOT; };
5757
065B45BB20605201001E1F41 /* ViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ViewController.xib; sourceTree = "<group>"; };
5858
065B45BD20605323001E1F41 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
59-
06C01E1B206647CF00C63FBB /* iPhone4S.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = iPhone4S.swift; path = iPhone/iPhone4S.swift; sourceTree = "<group>"; };
60-
06C01E682067032C00C63FBB /* iPadPro12_2nd_generation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPadPro12_2nd_generation.swift; path = iPad/iPadPro12_2nd_generation.swift; sourceTree = "<group>"; };
59+
06C01E1B206647CF00C63FBB /* iPhone4S.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iPhone4S.swift; sourceTree = "<group>"; };
60+
06C01E682067032C00C63FBB /* iPadPro12_2nd_generation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPadPro12_2nd_generation.swift; sourceTree = "<group>"; };
6161
06CF33A01FE81F90007B0B74 /* FBSnapshotTestCase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSnapshotTestCase.framework; path = Carthage/Build/iOS/FBSnapshotTestCase.framework; sourceTree = "<group>"; };
6262
06F6C6571FF3F73B00E055F0 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
6363
06F6C65D1FF3FE6F00E055F0 /* SnappyShrimpTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SnappyShrimpTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6464
06F6C65F1FF3FE6F00E055F0 /* SnappyShrimpTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnappyShrimpTests.swift; sourceTree = "<group>"; };
6565
06F6C6611FF3FE6F00E055F0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6666
4214CBF91FDFE34A00C7AB61 /* SnappyShrimp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SnappyShrimp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
67-
4214CBFC1FDFE34A00C7AB61 /* SnappyShrimp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SnappyShrimp.h; sourceTree = "<group>"; };
68-
4214CBFD1FDFE34A00C7AB61 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
67+
4214CBFC1FDFE34A00C7AB61 /* SnappyShrimp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SnappyShrimp.h; path = Sources/SnappyShrimp.h; sourceTree = "<group>"; };
68+
4214CBFD1FDFE34A00C7AB61 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sources/Info.plist; sourceTree = "<group>"; };
6969
4214CC261FDFE62600C7AB61 /* HostWindow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HostWindow.swift; sourceTree = "<group>"; };
7070
4214CC271FDFE62700C7AB61 /* Specifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Specifications.swift; sourceTree = "<group>"; };
7171
4214CC281FDFE62700C7AB61 /* SnapshotTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SnapshotTest.swift; sourceTree = "<group>"; };
7272
4214CC291FDFE62700C7AB61 /* Presentation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Presentation.swift; sourceTree = "<group>"; };
73-
4214CC6C1FDFEFE100C7AB61 /* Device.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Device.swift; sourceTree = "<group>"; };
74-
427E960A1FF2A08600B4A2B4 /* iPhone8Plus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhone8Plus.swift; path = iPhone/iPhone8Plus.swift; sourceTree = "<group>"; };
75-
427E960B1FF2A08600B4A2B4 /* iPhone6S.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhone6S.swift; path = iPhone/iPhone6S.swift; sourceTree = "<group>"; };
76-
427E960C1FF2A08600B4A2B4 /* iPhoneSE.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhoneSE.swift; path = iPhone/iPhoneSE.swift; sourceTree = "<group>"; };
77-
427E960D1FF2A08600B4A2B4 /* iPhone8.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhone8.swift; path = iPhone/iPhone8.swift; sourceTree = "<group>"; };
78-
427E960E1FF2A08600B4A2B4 /* iPhone6SPlus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhone6SPlus.swift; path = iPhone/iPhone6SPlus.swift; sourceTree = "<group>"; };
79-
427E960F1FF2A08600B4A2B4 /* iPhone7.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhone7.swift; path = iPhone/iPhone7.swift; sourceTree = "<group>"; };
80-
427E96101FF2A08600B4A2B4 /* iPhone7Plus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhone7Plus.swift; path = iPhone/iPhone7Plus.swift; sourceTree = "<group>"; };
81-
427E96111FF2A08600B4A2B4 /* iPhone6.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhone6.swift; path = iPhone/iPhone6.swift; sourceTree = "<group>"; };
82-
427E96121FF2A08600B4A2B4 /* iPhoneX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhoneX.swift; path = iPhone/iPhoneX.swift; sourceTree = "<group>"; };
83-
427E96131FF2A08600B4A2B4 /* iPhone6Plus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPhone6Plus.swift; path = iPhone/iPhone6Plus.swift; sourceTree = "<group>"; };
84-
427E961E1FF2A09000B4A2B4 /* iPadMini2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPadMini2.swift; path = iPad/iPadMini2.swift; sourceTree = "<group>"; };
85-
427E961F1FF2A09000B4A2B4 /* iPad5thGen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPad5thGen.swift; path = iPad/iPad5thGen.swift; sourceTree = "<group>"; };
86-
427E96201FF2A09000B4A2B4 /* iPadAir.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPadAir.swift; path = iPad/iPadAir.swift; sourceTree = "<group>"; };
87-
427E96211FF2A09000B4A2B4 /* iPadAir2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPadAir2.swift; path = iPad/iPadAir2.swift; sourceTree = "<group>"; };
88-
427E96221FF2A09000B4A2B4 /* iPadPro10.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPadPro10.swift; path = iPad/iPadPro10.swift; sourceTree = "<group>"; };
89-
427E96231FF2A09000B4A2B4 /* iPadMini.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPadMini.swift; path = iPad/iPadMini.swift; sourceTree = "<group>"; };
90-
427E96241FF2A09000B4A2B4 /* iPadPro12.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPadPro12.swift; path = iPad/iPadPro12.swift; sourceTree = "<group>"; };
91-
427E96251FF2A09000B4A2B4 /* iPadPro9.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = iPadPro9.swift; path = iPad/iPadPro9.swift; sourceTree = "<group>"; };
73+
4214CC6C1FDFEFE100C7AB61 /* Device.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Device.swift; path = ../../Sources/Device/Device.swift; sourceTree = "<group>"; };
74+
427E960A1FF2A08600B4A2B4 /* iPhone8Plus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhone8Plus.swift; sourceTree = "<group>"; };
75+
427E960B1FF2A08600B4A2B4 /* iPhone6S.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhone6S.swift; sourceTree = "<group>"; };
76+
427E960C1FF2A08600B4A2B4 /* iPhoneSE.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhoneSE.swift; sourceTree = "<group>"; };
77+
427E960D1FF2A08600B4A2B4 /* iPhone8.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhone8.swift; sourceTree = "<group>"; };
78+
427E960E1FF2A08600B4A2B4 /* iPhone6SPlus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhone6SPlus.swift; sourceTree = "<group>"; };
79+
427E960F1FF2A08600B4A2B4 /* iPhone7.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhone7.swift; sourceTree = "<group>"; };
80+
427E96101FF2A08600B4A2B4 /* iPhone7Plus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhone7Plus.swift; sourceTree = "<group>"; };
81+
427E96111FF2A08600B4A2B4 /* iPhone6.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhone6.swift; sourceTree = "<group>"; };
82+
427E96121FF2A08600B4A2B4 /* iPhoneX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhoneX.swift; sourceTree = "<group>"; };
83+
427E96131FF2A08600B4A2B4 /* iPhone6Plus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPhone6Plus.swift; sourceTree = "<group>"; };
84+
427E961E1FF2A09000B4A2B4 /* iPadMini2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPadMini2.swift; sourceTree = "<group>"; };
85+
427E961F1FF2A09000B4A2B4 /* iPad5thGen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPad5thGen.swift; sourceTree = "<group>"; };
86+
427E96201FF2A09000B4A2B4 /* iPadAir.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPadAir.swift; sourceTree = "<group>"; };
87+
427E96211FF2A09000B4A2B4 /* iPadAir2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPadAir2.swift; sourceTree = "<group>"; };
88+
427E96221FF2A09000B4A2B4 /* iPadPro10.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPadPro10.swift; sourceTree = "<group>"; };
89+
427E96231FF2A09000B4A2B4 /* iPadMini.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPadMini.swift; sourceTree = "<group>"; };
90+
427E96241FF2A09000B4A2B4 /* iPadPro12.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPadPro12.swift; sourceTree = "<group>"; };
91+
427E96251FF2A09000B4A2B4 /* iPadPro9.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = iPadPro9.swift; sourceTree = "<group>"; };
9292
/* End PBXFileReference section */
9393

9494
/* Begin PBXFrameworksBuildPhase section */
@@ -122,15 +122,16 @@
122122
name = Support;
123123
sourceTree = "<group>";
124124
};
125-
06CF339F1FE81CEB007B0B74 /* Source */ = {
125+
06CF339F1FE81CEB007B0B74 /* Logic */ = {
126126
isa = PBXGroup;
127127
children = (
128128
4214CC261FDFE62600C7AB61 /* HostWindow.swift */,
129129
4214CC291FDFE62700C7AB61 /* Presentation.swift */,
130130
4214CC281FDFE62700C7AB61 /* SnapshotTest.swift */,
131131
4214CC271FDFE62700C7AB61 /* Specifications.swift */,
132132
);
133-
name = Source;
133+
name = Logic;
134+
path = Sources/Logic;
134135
sourceTree = "<group>";
135136
};
136137
06F6C65E1FF3FE6F00E055F0 /* SnappyShrimpTests */ = {
@@ -167,7 +168,7 @@
167168
isa = PBXGroup;
168169
children = (
169170
4214CC6B1FDFEFA700C7AB61 /* Device */,
170-
06CF339F1FE81CEB007B0B74 /* Source */,
171+
06CF339F1FE81CEB007B0B74 /* Logic */,
171172
06CF339E1FE81CDD007B0B74 /* Support */,
172173
);
173174
path = SnappyShrimp;
@@ -188,7 +189,8 @@
188189
427E96071FF2A06600B4A2B4 /* iPad */,
189190
4214CC6C1FDFEFE100C7AB61 /* Device.swift */,
190191
);
191-
path = Device;
192+
name = Device;
193+
path = Source/Device;
192194
sourceTree = "<group>";
193195
};
194196
427E96071FF2A06600B4A2B4 /* iPad */ = {
@@ -205,6 +207,7 @@
205207
06C01E682067032C00C63FBB /* iPadPro12_2nd_generation.swift */,
206208
);
207209
name = iPad;
210+
path = ../../Sources/Device/iPad;
208211
sourceTree = "<group>";
209212
};
210213
427E96091FF2A07700B4A2B4 /* iPhone */ = {
@@ -223,6 +226,7 @@
223226
427E96121FF2A08600B4A2B4 /* iPhoneX.swift */,
224227
);
225228
name = iPhone;
229+
path = ../../Sources/Device/iPhone;
226230
sourceTree = "<group>";
227231
};
228232
/* End PBXGroup section */
@@ -567,7 +571,7 @@
567571
"$(PROJECT_DIR)/Carthage/Build/iOS",
568572
"$(PLATFORM_DIR)/Developer/Library/Frameworks",
569573
);
570-
INFOPLIST_FILE = SnappyShrimp/Info.plist;
574+
INFOPLIST_FILE = "$(SRCROOT)/SnappyShrimp/Sources/Info.plist";
571575
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
572576
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
573577
PRODUCT_BUNDLE_IDENTIFIER = com.RomanTysiachnik.SnappyShrimp;
@@ -595,7 +599,7 @@
595599
"$(PROJECT_DIR)/Carthage/Build/iOS",
596600
"$(PLATFORM_DIR)/Developer/Library/Frameworks",
597601
);
598-
INFOPLIST_FILE = SnappyShrimp/Info.plist;
602+
INFOPLIST_FILE = "$(SRCROOT)/SnappyShrimp/Sources/Info.plist";
599603
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
600604
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
601605
PRODUCT_BUNDLE_IDENTIFIER = com.RomanTysiachnik.SnappyShrimp;

SnappyShrimp/Device/Device.swift renamed to SnappyShrimp/Sources/Device/Device.swift

File renamed without changes.

SnappyShrimp/Device/iPad/iPad5thGen.swift renamed to SnappyShrimp/Sources/Device/iPad/iPad5thGen.swift

File renamed without changes.

SnappyShrimp/Device/iPad/iPadAir.swift renamed to SnappyShrimp/Sources/Device/iPad/iPadAir.swift

File renamed without changes.

SnappyShrimp/Device/iPad/iPadAir2.swift renamed to SnappyShrimp/Sources/Device/iPad/iPadAir2.swift

File renamed without changes.

SnappyShrimp/Device/iPad/iPadMini.swift renamed to SnappyShrimp/Sources/Device/iPad/iPadMini.swift

File renamed without changes.

SnappyShrimp/Device/iPad/iPadMini2.swift renamed to SnappyShrimp/Sources/Device/iPad/iPadMini2.swift

File renamed without changes.

SnappyShrimp/Device/iPad/iPadPro10.swift renamed to SnappyShrimp/Sources/Device/iPad/iPadPro10.swift

File renamed without changes.

0 commit comments

Comments
 (0)