Skip to content

Commit

Permalink
Merge branch 'release/1.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
malcommac committed May 23, 2019
2 parents fcdc311 + 54adc79 commit 1f55949
Show file tree
Hide file tree
Showing 24 changed files with 443 additions and 302 deletions.
2 changes: 1 addition & 1 deletion Configs/Owl.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.2</string>
<string>1.0.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
18 changes: 11 additions & 7 deletions Owl.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
641CD9DB22789E8F00C88886 /* UICollectionView+Support.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9D422789E8F00C88886 /* UICollectionView+Support.swift */; };
641CD9DC22789E8F00C88886 /* StagedChangeset+Sectioned.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9D522789E8F00C88886 /* StagedChangeset+Sectioned.swift */; };
641CD9DD22789E8F00C88886 /* ElementPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9D622789E8F00C88886 /* ElementPath.swift */; };
641CD9E222789E9C00C88886 /* ReusableCellViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9DF22789E9B00C88886 /* ReusableCellViewProtocol.swift */; };
641CD9E222789E9C00C88886 /* ReusableViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9DF22789E9B00C88886 /* ReusableViewProtocol.swift */; };
641CD9E322789E9C00C88886 /* ScrollViewEventsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9E022789E9C00C88886 /* ScrollViewEventsHandler.swift */; };
641CD9E422789E9C00C88886 /* ElementRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9E122789E9C00C88886 /* ElementRepresentable.swift */; };
641CD9EE22789F0C00C88886 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9ED22789F0C00C88886 /* AppDelegate.swift */; };
Expand Down Expand Up @@ -84,7 +84,7 @@
641CDA4922789FFF00C88886 /* CollectionDirector+Support.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9C122789E5C00C88886 /* CollectionDirector+Support.swift */; };
641CDA4A22789FFF00C88886 /* CollectionHeaderFooterProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9C222789E5C00C88886 /* CollectionHeaderFooterProtocol.swift */; };
641CDA4B22789FFF00C88886 /* ElementRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9E122789E9C00C88886 /* ElementRepresentable.swift */; };
641CDA4C22789FFF00C88886 /* ReusableCellViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9DF22789E9B00C88886 /* ReusableCellViewProtocol.swift */; };
641CDA4C22789FFF00C88886 /* ReusableViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9DF22789E9B00C88886 /* ReusableViewProtocol.swift */; };
641CDA4D22789FFF00C88886 /* ScrollViewEventsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9E022789E9C00C88886 /* ScrollViewEventsHandler.swift */; };
641CDA4E22789FFF00C88886 /* Algorithm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9D022789E8E00C88886 /* Algorithm.swift */; };
641CDA4F22789FFF00C88886 /* Changeset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9D322789E8F00C88886 /* Changeset.swift */; };
Expand All @@ -95,6 +95,7 @@
641CDA5422789FFF00C88886 /* UITableView+Support.swift in Sources */ = {isa = PBXBuildFile; fileRef = 641CD9D122789E8F00C88886 /* UITableView+Support.swift */; };
6478952D227F5091005F983F /* Extras.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6478952C227F5091005F983F /* Extras.swift */; };
6478952E227F5099005F983F /* Extras.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6478952C227F5091005F983F /* Extras.swift */; };
647DD9862296DF9600288935 /* CatalogItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 647DD9852296DF9600288935 /* CatalogItemCell.xib */; };
8933C7901EB5B82D000D00A4 /* OwlTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8933C7891EB5B82A000D00A4 /* OwlTests.swift */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -136,7 +137,7 @@
641CD9D422789E8F00C88886 /* UICollectionView+Support.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UICollectionView+Support.swift"; sourceTree = "<group>"; };
641CD9D522789E8F00C88886 /* StagedChangeset+Sectioned.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "StagedChangeset+Sectioned.swift"; sourceTree = "<group>"; };
641CD9D622789E8F00C88886 /* ElementPath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementPath.swift; sourceTree = "<group>"; };
641CD9DF22789E9B00C88886 /* ReusableCellViewProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReusableCellViewProtocol.swift; sourceTree = "<group>"; };
641CD9DF22789E9B00C88886 /* ReusableViewProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReusableViewProtocol.swift; sourceTree = "<group>"; };
641CD9E022789E9C00C88886 /* ScrollViewEventsHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScrollViewEventsHandler.swift; sourceTree = "<group>"; };
641CD9E122789E9C00C88886 /* ElementRepresentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementRepresentable.swift; sourceTree = "<group>"; };
641CD9EB22789F0C00C88886 /* OwlDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OwlDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -171,6 +172,7 @@
641CDA3322789FD100C88886 /* UIImageView+Extras.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImageView+Extras.swift"; sourceTree = "<group>"; };
641CDA3422789FD200C88886 /* Commons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Commons.swift; sourceTree = "<group>"; };
6478952C227F5091005F983F /* Extras.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extras.swift; sourceTree = "<group>"; };
647DD9852296DF9600288935 /* CatalogItemCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CatalogItemCell.xib; sourceTree = "<group>"; };
8933C7891EB5B82A000D00A4 /* OwlTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OwlTests.swift; sourceTree = "<group>"; };
AD2FAA261CD0B6D800659CF4 /* Owl.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Owl.plist; sourceTree = "<group>"; };
AD2FAA281CD0B6E100659CF4 /* OwlTests.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = OwlTests.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -330,7 +332,7 @@
isa = PBXGroup;
children = (
641CD9E122789E9C00C88886 /* ElementRepresentable.swift */,
641CD9DF22789E9B00C88886 /* ReusableCellViewProtocol.swift */,
641CD9DF22789E9B00C88886 /* ReusableViewProtocol.swift */,
641CD9E022789E9C00C88886 /* ScrollViewEventsHandler.swift */,
6478952C227F5091005F983F /* Extras.swift */,
);
Expand All @@ -350,10 +352,10 @@
isa = PBXGroup;
children = (
641CD9ED22789F0C00C88886 /* AppDelegate.swift */,
641CD9F122789F0C00C88886 /* Main.storyboard */,
641CD9FF22789F3B00C88886 /* Catalog Menu */,
641CDA0922789F5A00C88886 /* Contacts */,
641CDA2922789F9D00C88886 /* Emoji */,
641CD9F122789F0C00C88886 /* Main.storyboard */,
641CD9F422789F0E00C88886 /* Assets.xcassets */,
641CD9F622789F0E00C88886 /* LaunchScreen.storyboard */,
641CDA3822789FD400C88886 /* Support */,
Expand All @@ -376,6 +378,7 @@
children = (
641CDA0022789F4100C88886 /* CatalogItem.swift */,
641CDA0122789F4100C88886 /* CatalogItemCell.swift */,
647DD9852296DF9600288935 /* CatalogItemCell.xib */,
);
path = "Models & UI";
sourceTree = "<group>";
Expand Down Expand Up @@ -638,6 +641,7 @@
641CDA1822789F7400C88886 /* GroupCell.xib in Resources */,
641CDA2222789F8600C88886 /* companies_db.json in Resources */,
641CDA0722789F5700C88886 /* ContactsController.storyboard in Resources */,
647DD9862296DF9600288935 /* CatalogItemCell.xib in Resources */,
641CDA1B22789F7400C88886 /* GroupFooterView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -663,7 +667,7 @@
641CD9A722789E1700C88886 /* TableSection.swift in Sources */,
641CD9C422789E5C00C88886 /* CollectionDirector+Support.swift in Sources */,
641CD9D922789E8F00C88886 /* StagedChangeset.swift in Sources */,
641CD9E222789E9C00C88886 /* ReusableCellViewProtocol.swift in Sources */,
641CD9E222789E9C00C88886 /* ReusableViewProtocol.swift in Sources */,
641CD9DC22789E8F00C88886 /* StagedChangeset+Sectioned.swift in Sources */,
641CD9AC22789E2B00C88886 /* TableDirector+Support.swift in Sources */,
641CD9C922789E6F00C88886 /* CollectionHeaderFooterAdapter.swift in Sources */,
Expand Down Expand Up @@ -709,7 +713,7 @@
641CDA3A22789FFF00C88886 /* TableSection.swift in Sources */,
641CDA4122789FFF00C88886 /* TableSectionHeaderFooterProtocol.swift in Sources */,
641CDA4922789FFF00C88886 /* CollectionDirector+Support.swift in Sources */,
641CDA4C22789FFF00C88886 /* ReusableCellViewProtocol.swift in Sources */,
641CDA4C22789FFF00C88886 /* ReusableViewProtocol.swift in Sources */,
641CDA4422789FFF00C88886 /* FlowCollectionDirector.swift in Sources */,
641CDA5222789FFF00C88886 /* StagedChangeset+Sectioned.swift in Sources */,
641CDA5322789FFF00C88886 /* UICollectionView+Support.swift in Sources */,
Expand Down
91 changes: 91 additions & 0 deletions Owl.xcodeproj/xcshareddata/xcschemes/OwlDemo.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "641CD9EA22789F0C00C88886"
BuildableName = "OwlDemo.app"
BlueprintName = "OwlDemo"
ReferencedContainer = "container:Owl.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "641CD9EA22789F0C00C88886"
BuildableName = "OwlDemo.app"
BlueprintName = "OwlDemo"
ReferencedContainer = "container:Owl.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "641CD9EA22789F0C00C88886"
BuildableName = "OwlDemo.app"
BlueprintName = "OwlDemo"
ReferencedContainer = "container:Owl.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "641CD9EA22789F0C00C88886"
BuildableName = "OwlDemo.app"
BlueprintName = "OwlDemo"
ReferencedContainer = "container:Owl.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit 1f55949

Please sign in to comment.