Skip to content

Commit d0f15ca

Browse files
author
Stephane Magne
authored
Merge pull request #9 from scribd/stephane/add_swift_pm_support
Add SwiftPM Support
2 parents c9c7a0f + 44554c3 commit d0f15ca

File tree

49 files changed

+140
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+140
-28
lines changed

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LiveCollectionsFramework/LiveCollections/Info.plist‎ renamed to ‎Info.plist‎

File renamed without changes.

‎LiveCollectionsFramework/LiveCollections.xcodeproj/project.pbxproj‎ renamed to ‎LiveCollections.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
F4B9013E2133A2A400E3B51C /* AnyDeltaUpdatableViewDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnyDeltaUpdatableViewDelegate.swift; sourceTree = "<group>"; };
7373
F4D772DF20FBC4BE002F1C43 /* LiveCollections.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LiveCollections.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7474
F4D772E220FBC4BE002F1C43 /* LiveCollections.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LiveCollections.h; sourceTree = "<group>"; };
75-
F4D772E320FBC4BE002F1C43 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
75+
F4D772E320FBC4BE002F1C43 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../../Info.plist; sourceTree = "<group>"; };
7676
F4D772E820FBC4BF002F1C43 /* LiveCollectionsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LiveCollectionsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
7777
F4D772ED20FBC4BF002F1C43 /* LiveCollectionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveCollectionsTests.swift; sourceTree = "<group>"; };
78-
F4D772EF20FBC4BF002F1C43 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
78+
F4D772EF20FBC4BF002F1C43 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "../../Tests-Info.plist"; sourceTree = "<group>"; };
7979
F4D772FB20FBC4E7002F1C43 /* DataProviderProtocols.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DataProviderProtocols.swift; sourceTree = "<group>"; };
8080
F4D7730020FBC4E7002F1C43 /* SectionDataCalculator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionDataCalculator.swift; sourceTree = "<group>"; };
8181
F4D7730320FBC4E7002F1C43 /* SectionUpdate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SectionUpdate.swift; sourceTree = "<group>"; };
@@ -175,17 +175,19 @@
175175
F4D772E220FBC4BE002F1C43 /* LiveCollections.h */,
176176
F4D772F920FBC4E7002F1C43 /* Classes */,
177177
);
178-
path = LiveCollections;
178+
name = LiveCollections;
179+
path = Sources/LiveCollections;
179180
sourceTree = "<group>";
180181
};
181182
F4D772EC20FBC4BF002F1C43 /* LiveCollectionsTests */ = {
182183
isa = PBXGroup;
183184
children = (
184185
F4847DF92137C89400859EFF /* ItemDeltaTests */,
185186
F4D772ED20FBC4BF002F1C43 /* LiveCollectionsTests.swift */,
186-
F4D772EF20FBC4BF002F1C43 /* Info.plist */,
187+
F4D772EF20FBC4BF002F1C43 /* Tests-Info.plist */,
187188
);
188-
path = LiveCollectionsTests;
189+
name = LiveCollectionsTests;
190+
path = Sources/LiveCollectionsTests;
189191
sourceTree = "<group>";
190192
};
191193
F4D772F920FBC4E7002F1C43 /* Classes */ = {
@@ -618,7 +620,7 @@
618620
DYLIB_COMPATIBILITY_VERSION = 1;
619621
DYLIB_CURRENT_VERSION = 1;
620622
DYLIB_INSTALL_NAME_BASE = "@rpath";
621-
INFOPLIST_FILE = LiveCollections/Info.plist;
623+
INFOPLIST_FILE = Info.plist;
622624
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
623625
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
624626
LD_RUNPATH_SEARCH_PATHS = (
@@ -646,7 +648,7 @@
646648
DYLIB_COMPATIBILITY_VERSION = 1;
647649
DYLIB_CURRENT_VERSION = 1;
648650
DYLIB_INSTALL_NAME_BASE = "@rpath";
649-
INFOPLIST_FILE = LiveCollections/Info.plist;
651+
INFOPLIST_FILE = Info.plist;
650652
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
651653
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
652654
LD_RUNPATH_SEARCH_PATHS = (
@@ -669,7 +671,7 @@
669671
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
670672
CODE_SIGN_STYLE = Automatic;
671673
DEVELOPMENT_TEAM = E7MUW2QU95;
672-
INFOPLIST_FILE = LiveCollectionsTests/Info.plist;
674+
INFOPLIST_FILE = "Tests-Info.plist";
673675
LD_RUNPATH_SEARCH_PATHS = (
674676
"$(inherited)",
675677
"@executable_path/Frameworks",
@@ -688,7 +690,7 @@
688690
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
689691
CODE_SIGN_STYLE = Automatic;
690692
DEVELOPMENT_TEAM = E7MUW2QU95;
691-
INFOPLIST_FILE = LiveCollectionsTests/Info.plist;
693+
INFOPLIST_FILE = "Tests-Info.plist";
692694
LD_RUNPATH_SEARCH_PATHS = (
693695
"$(inherited)",
694696
"@executable_path/Frameworks",

‎LiveCollectionsFramework/LiveCollections.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎ renamed to ‎LiveCollections.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

File renamed without changes.

‎LiveCollectionsFramework/LiveCollections.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎ renamed to ‎LiveCollections.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist‎

File renamed without changes.

‎LiveCollectionsFramework/LiveCollections.xcodeproj/xcshareddata/xcschemes/LiveCollections.xcscheme‎ renamed to ‎LiveCollections.xcodeproj/xcshareddata/xcschemes/LiveCollections.xcscheme‎

File renamed without changes.

‎LiveCollections.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎LiveCollectionsSample/LiveCollectionsSample.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@
373373
F4D7737D20FC5D34002F1C43 /* DataCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D7737C20FC5D34002F1C43 /* DataCoordinator.swift */; };
374374
F4D7737F20FC5F14002F1C43 /* PresentationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D7737E20FC5F14002F1C43 /* PresentationView.swift */; };
375375
F4D7738820FC64FD002F1C43 /* MovieCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D7738720FC64FD002F1C43 /* MovieCollectionViewCell.swift */; };
376-
F4D7738A20FD057C002F1C43 /* ResuableViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D7738920FD057C002F1C43 /* ResuableViewProtocol.swift */; };
376+
F4D7738A20FD057C002F1C43 /* ResuableViewHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4D7738920FD057C002F1C43 /* ResuableViewHelper.swift */; };
377377
F4F2054521727B9A00C211AB /* ScenarioThirteenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4F2054421727B9A00C211AB /* ScenarioThirteenViewController.swift */; };
378378
F4F205562172D24800C211AB /* ScenarioFourteenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4F205552172D24800C211AB /* ScenarioFourteenViewController.swift */; };
379379
F4F2055A2173391B00C211AB /* ScenarioFifteenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4F205592173391B00C211AB /* ScenarioFifteenViewController.swift */; };
@@ -763,7 +763,7 @@
763763
F4D7737C20FC5D34002F1C43 /* DataCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataCoordinator.swift; sourceTree = "<group>"; };
764764
F4D7737E20FC5F14002F1C43 /* PresentationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationView.swift; sourceTree = "<group>"; };
765765
F4D7738720FC64FD002F1C43 /* MovieCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MovieCollectionViewCell.swift; sourceTree = "<group>"; };
766-
F4D7738920FD057C002F1C43 /* ResuableViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResuableViewProtocol.swift; sourceTree = "<group>"; };
766+
F4D7738920FD057C002F1C43 /* ResuableViewHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResuableViewHelper.swift; sourceTree = "<group>"; };
767767
F4F2054421727B9A00C211AB /* ScenarioThirteenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScenarioThirteenViewController.swift; sourceTree = "<group>"; };
768768
F4F205552172D24800C211AB /* ScenarioFourteenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScenarioFourteenViewController.swift; sourceTree = "<group>"; };
769769
F4F205592173391B00C211AB /* ScenarioFifteenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScenarioFifteenViewController.swift; sourceTree = "<group>"; };
@@ -1265,7 +1265,7 @@
12651265
children = (
12661266
F4D7737A20FC57B5002F1C43 /* PlayerControl.swift */,
12671267
F4D7737E20FC5F14002F1C43 /* PresentationView.swift */,
1268-
F4D7738920FD057C002F1C43 /* ResuableViewProtocol.swift */,
1268+
F4D7738920FD057C002F1C43 /* ResuableViewHelper.swift */,
12691269
F4D7738720FC64FD002F1C43 /* MovieCollectionViewCell.swift */,
12701270
F4B0F796213DA45400179029 /* MovieTableViewCell.swift */,
12711271
F454C230212A4CFB0018DC6E /* CarouselTableViewCell.swift */,
@@ -1709,7 +1709,7 @@
17091709
F4D7738820FC64FD002F1C43 /* MovieCollectionViewCell.swift in Sources */,
17101710
F4B0F794213DA04600179029 /* ScenarioSixViewController.swift in Sources */,
17111711
F4AE4CEC21063CC2000205E1 /* ScenarioSevenViewController.swift in Sources */,
1712-
F4D7738A20FD057C002F1C43 /* ResuableViewProtocol.swift in Sources */,
1712+
F4D7738A20FD057C002F1C43 /* ResuableViewHelper.swift in Sources */,
17131713
F4AE4CEA2105911E000205E1 /* ScenarioFourViewController.swift in Sources */,
17141714
F4AE4CEF21063D14000205E1 /* CarouselController.swift in Sources */,
17151715
F4D7735720FC148E002F1C43 /* APIClient.swift in Sources */,

‎LiveCollectionsSample/LiveCollectionsSample.xcodeproj/xcshareddata/xcschemes/LiveCollectionsSample.xcscheme‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1250"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "F4D7733220FC147E002F1C43"
18+
BuildableName = "LC Scenarios.app"
19+
BlueprintName = "LiveCollectionsSample"
20+
ReferencedContainer = "container:LiveCollectionsSample.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "F4D7733220FC147E002F1C43"
48+
BuildableName = "LC Scenarios.app"
49+
BlueprintName = "LiveCollectionsSample"
50+
ReferencedContainer = "container:LiveCollectionsSample.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "F4D7733220FC147E002F1C43"
65+
BuildableName = "LC Scenarios.app"
66+
BlueprintName = "LiveCollectionsSample"
67+
ReferencedContainer = "container:LiveCollectionsSample.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Release"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎LiveCollectionsSample/LiveCollectionsSample/Source/Shared Views/ResuableViewProtocol.swift‎ renamed to ‎LiveCollectionsSample/LiveCollectionsSample/Source/Shared Views/ResuableViewHelper.swift‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// ResuableViewProtocol.swift
2+
// ResuableViewHelper.swift
33
// LiveCollectionsSample
44
//
55
// Created by Paris Pinkney on 7/7/16.
@@ -8,17 +8,13 @@
88

99
import UIKit
1010

11-
protocol ReusableViewProtocol: class {
12-
static var reuseIdentifier: String { get }
13-
}
14-
15-
extension UITableViewCell: ReusableViewProtocol {
11+
extension UITableViewCell {
1612
static var reuseIdentifier: String {
1713
return String(describing: self)
1814
}
1915
}
2016

21-
extension UICollectionReusableView: ReusableViewProtocol {
17+
extension UICollectionReusableView {
2218
static var reuseIdentifier: String {
2319
return String(describing: self)
2420
}

0 commit comments

Comments
 (0)