Skip to content
This repository was archived by the owner on Apr 15, 2020. It is now read-only.

Example mixed swift3.0 #60

Merged
jessesquires merged 5 commits into from
Jul 29, 2016
Merged

Example mixed swift3.0 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e996c2b
Add example with mixed cell types (#58). close #57
dcaunt Jul 27, 2016
77540a7
Merge branch 'develop' into swift2.3
jessesquires Jul 28, 2016
63ac07f
proj settings
jessesquires Jul 28, 2016
4912ecc
Merge branch 'swift2.3' into swift3.0
dcaunt Jul 28, 2016
4ee1a40
Update mixed cell type example for Swift 3.0
dcaunt Jul 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions Example/Example.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
88AD28A71D1F97BC000492FC /* ExampleModel.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 88AD28A31D1F97A3000492FC /* ExampleModel.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
88DCAD911CB87E6700C018AF /* JSQDataSourcesKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 88DCAD8E1CB87DD900C018AF /* JSQDataSourcesKit.framework */; };
88DCAD921CB87E6700C018AF /* JSQDataSourcesKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 88DCAD8E1CB87DD900C018AF /* JSQDataSourcesKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
BF21124D1D46663600F1840A /* ComposedCellViewFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF21124C1D46663600F1840A /* ComposedCellViewFactory.swift */; };
BF5C03641D3FED6700CA3EA3 /* FancyCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF5C03631D3FED6700CA3EA3 /* FancyCollectionViewCell.xib */; };
BF5C03691D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF5C03681D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift */; };
BF6AEBD11D3E91A40048AE97 /* MixedCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF6AEBD01D3E91A40048AE97 /* MixedCollectionViewController.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -139,6 +143,10 @@
88AD289D1D1F97A3000492FC /* ExampleModel.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ExampleModel.xcodeproj; path = ExampleModel/ExampleModel.xcodeproj; sourceTree = "<group>"; };
88DB89C11A86D1A900DED153 /* DataSources.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DataSources.app; sourceTree = BUILT_PRODUCTS_DIR; };
88DCAD881CB87DD900C018AF /* JSQDataSourcesKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = JSQDataSourcesKit.xcodeproj; path = ../JSQDataSourcesKit.xcodeproj; sourceTree = "<group>"; };
BF21124C1D46663600F1840A /* ComposedCellViewFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ComposedCellViewFactory.swift; sourceTree = "<group>"; };
BF5C03631D3FED6700CA3EA3 /* FancyCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FancyCollectionViewCell.xib; sourceTree = "<group>"; };
BF5C03681D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FancyCollectionViewCell.swift; sourceTree = "<group>"; };
BF6AEBD01D3E91A40048AE97 /* MixedCollectionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MixedCollectionViewController.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -195,15 +203,19 @@
886EC79F1CFF2E5E00BDE6FA /* CollectionViewCell.swift */,
886EC7A01CFF2E5E00BDE6FA /* CollectionViewCell.xib */,
886EC7A11CFF2E5E00BDE6FA /* CollectionViewController.swift */,
BF21124C1D46663600F1840A /* ComposedCellViewFactory.swift */,
886EC7A21CFF2E5E00BDE6FA /* ComposedSupplementaryViewFactory.swift */,
886EC7A41CFF2E5E00BDE6FA /* Extensions.swift */,
BF5C03681D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift */,
BF5C03631D3FED6700CA3EA3 /* FancyCollectionViewCell.xib */,
886EC7A51CFF2E5E00BDE6FA /* FetchedCollectionViewController.swift */,
886EC7A61CFF2E5E00BDE6FA /* FetchedTableViewController.swift */,
886EC7A71CFF2E5E00BDE6FA /* Helpers.swift */,
886EC7A81CFF2E5E00BDE6FA /* Images.xcassets */,
886EC7A91CFF2E5F00BDE6FA /* Info.plist */,
886EC79B1CFF2E5E00BDE6FA /* LaunchScreen.xib */,
886EC79D1CFF2E5E00BDE6FA /* Main.storyboard */,
BF6AEBD01D3E91A40048AE97 /* MixedCollectionViewController.swift */,
886EC7AC1CFF2E5F00BDE6FA /* TableViewController.swift */,
886EC7AE1CFF2E5F00BDE6FA /* ViewController.swift */,
);
Expand Down Expand Up @@ -429,6 +441,7 @@
886EC7BB1CFF2E5F00BDE6FA /* Images.xcassets in Resources */,
886EC7B11CFF2E5F00BDE6FA /* Main.storyboard in Resources */,
886EC7B31CFF2E5F00BDE6FA /* CollectionViewCell.xib in Resources */,
BF5C03641D3FED6700CA3EA3 /* FancyCollectionViewCell.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -462,9 +475,12 @@
886EC7B41CFF2E5F00BDE6FA /* CollectionViewController.swift in Sources */,
886EC7BA1CFF2E5F00BDE6FA /* Helpers.swift in Sources */,
886EC7B81CFF2E5F00BDE6FA /* FetchedCollectionViewController.swift in Sources */,
BF21124D1D46663600F1840A /* ComposedCellViewFactory.swift in Sources */,
886EC7BE1CFF2E5F00BDE6FA /* TableViewController.swift in Sources */,
886EC7C01CFF2E5F00BDE6FA /* ViewController.swift in Sources */,
886EC7B21CFF2E5F00BDE6FA /* CollectionViewCell.swift in Sources */,
BF5C03691D3FED7F00CA3EA3 /* FancyCollectionViewCell.swift in Sources */,
BF6AEBD11D3E91A40048AE97 /* MixedCollectionViewController.swift in Sources */,
886EC7AF1CFF2E5F00BDE6FA /* AppDelegate.swift in Sources */,
886EC7B51CFF2E5F00BDE6FA /* ComposedSupplementaryViewFactory.swift in Sources */,
);
Expand Down Expand Up @@ -619,7 +635,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = DataSources;
Expand Down Expand Up @@ -659,7 +675,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_NAME = DataSources;
SDKROOT = iphoneos;
Expand Down
Loading