Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Carthage #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support Carthage #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82adbda
Support Carthage
takuoka Oct 30, 2015
89be781
fix demo error
takuoka Oct 30, 2015
8075a40
fix deployment target
takuoka Nov 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions WaterfallDemo/CollectionViewWaterfallLayout/CollectionViewWaterfallLayout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//
// CollectionViewWaterfallLayout.h
// CollectionViewWaterfallLayout
//
// Created by 岡本拓也 on 2015/10/30.
// Copyright © 2015年 Eric Cerney. All rights reserved.
//

#import <UIKit/UIKit.h>

//! Project version number for CollectionViewWaterfallLayout.
FOUNDATION_EXPORT double CollectionViewWaterfallLayoutVersionNumber;

//! Project version string for CollectionViewWaterfallLayout.
FOUNDATION_EXPORT const unsigned char CollectionViewWaterfallLayoutVersionString[];

// In this header, you should import all the public headers of your framework using statements like #import <CollectionViewWaterfallLayout/PublicHeader.h>


26 changes: 26 additions & 0 deletions WaterfallDemo/CollectionViewWaterfallLayout/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
158 changes: 158 additions & 0 deletions WaterfallDemo/CollectionViewWaterfallLayoutDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
029C0A32197E226600DA6FE9 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 029C0A31197E226600DA6FE9 /* Images.xcassets */; };
029C0A3E197E226600DA6FE9 /* WaterfallFlowLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029C0A3D197E226600DA6FE9 /* WaterfallFlowLayoutTests.swift */; };
029C0A4C19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029C0A4B19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift */; };
B0253DA31BE3392600027A60 /* CollectionViewWaterfallLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = B0253DA21BE3392600027A60 /* CollectionViewWaterfallLayout.h */; settings = {ATTRIBUTES = (Public, ); }; };
B0253DA81BE3392600027A60 /* CollectionViewWaterfallLayout.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B0253DA01BE3392600027A60 /* CollectionViewWaterfallLayout.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B0253DAD1BE3393700027A60 /* CollectionViewWaterfallLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029C0A4B19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -23,8 +26,29 @@
remoteGlobalIDString = 029C0A24197E226600DA6FE9;
remoteInfo = WaterfallFlowLayout;
};
B0253DA51BE3392600027A60 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 029C0A1D197E226600DA6FE9 /* Project object */;
proxyType = 1;
remoteGlobalIDString = B0253D9F1BE3392600027A60;
remoteInfo = CollectionViewWaterfallLayout;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
B0253DAC1BE3392600027A60 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
B0253DA81BE3392600027A60 /* CollectionViewWaterfallLayout.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
029C0A25197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CollectionViewWaterfallLayoutDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
029C0A29197E226600DA6FE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -36,6 +60,9 @@
029C0A3C197E226600DA6FE9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
029C0A3D197E226600DA6FE9 /* WaterfallFlowLayoutTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaterfallFlowLayoutTests.swift; sourceTree = "<group>"; };
029C0A4B19802E5E00DA6FE9 /* CollectionViewWaterfallLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CollectionViewWaterfallLayout.swift; path = ../../CollectionViewWaterfallLayout.swift; sourceTree = "<group>"; };
B0253DA01BE3392600027A60 /* CollectionViewWaterfallLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CollectionViewWaterfallLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B0253DA21BE3392600027A60 /* CollectionViewWaterfallLayout.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CollectionViewWaterfallLayout.h; sourceTree = "<group>"; };
B0253DA41BE3392600027A60 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -53,6 +80,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B0253D9C1BE3392600027A60 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
Expand All @@ -61,6 +95,7 @@
children = (
029C0A27197E226600DA6FE9 /* WaterfallFlowLayout */,
029C0A3A197E226600DA6FE9 /* WaterfallFlowLayoutTests */,
B0253DA11BE3392600027A60 /* CollectionViewWaterfallLayout */,
029C0A26197E226600DA6FE9 /* Products */,
);
sourceTree = "<group>";
Expand All @@ -70,6 +105,7 @@
children = (
029C0A25197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.app */,
029C0A37197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.xctest */,
B0253DA01BE3392600027A60 /* CollectionViewWaterfallLayout.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -112,8 +148,28 @@
name = "Supporting Files";
sourceTree = "<group>";
};
B0253DA11BE3392600027A60 /* CollectionViewWaterfallLayout */ = {
isa = PBXGroup;
children = (
B0253DA21BE3392600027A60 /* CollectionViewWaterfallLayout.h */,
B0253DA41BE3392600027A60 /* Info.plist */,
);
path = CollectionViewWaterfallLayout;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
B0253D9D1BE3392600027A60 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
B0253DA31BE3392600027A60 /* CollectionViewWaterfallLayout.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
029C0A24197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo */ = {
isa = PBXNativeTarget;
Expand All @@ -122,10 +178,12 @@
029C0A21197E226600DA6FE9 /* Sources */,
029C0A22197E226600DA6FE9 /* Frameworks */,
029C0A23197E226600DA6FE9 /* Resources */,
B0253DAC1BE3392600027A60 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
B0253DA61BE3392600027A60 /* PBXTargetDependency */,
);
name = CollectionViewWaterfallLayoutDemo;
productName = WaterfallFlowLayout;
Expand All @@ -150,6 +208,24 @@
productReference = 029C0A37197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
B0253D9F1BE3392600027A60 /* CollectionViewWaterfallLayout */ = {
isa = PBXNativeTarget;
buildConfigurationList = B0253DAB1BE3392600027A60 /* Build configuration list for PBXNativeTarget "CollectionViewWaterfallLayout" */;
buildPhases = (
B0253D9B1BE3392600027A60 /* Sources */,
B0253D9C1BE3392600027A60 /* Frameworks */,
B0253D9D1BE3392600027A60 /* Headers */,
B0253D9E1BE3392600027A60 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = CollectionViewWaterfallLayout;
productName = CollectionViewWaterfallLayout;
productReference = B0253DA01BE3392600027A60 /* CollectionViewWaterfallLayout.framework */;
productType = "com.apple.product-type.framework";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
Expand All @@ -167,6 +243,9 @@
CreatedOnToolsVersion = 6.0;
TestTargetID = 029C0A24197E226600DA6FE9;
};
B0253D9F1BE3392600027A60 = {
CreatedOnToolsVersion = 7.1;
};
};
};
buildConfigurationList = 029C0A20197E226600DA6FE9 /* Build configuration list for PBXProject "CollectionViewWaterfallLayoutDemo" */;
Expand All @@ -184,6 +263,7 @@
targets = (
029C0A24197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo */,
029C0A36197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemoTests */,
B0253D9F1BE3392600027A60 /* CollectionViewWaterfallLayout */,
);
};
/* End PBXProject section */
Expand All @@ -205,6 +285,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B0253D9E1BE3392600027A60 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand All @@ -226,6 +313,14 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
B0253D9B1BE3392600027A60 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B0253DAD1BE3393700027A60 /* CollectionViewWaterfallLayout.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
Expand All @@ -234,6 +329,11 @@
target = 029C0A24197E226600DA6FE9 /* CollectionViewWaterfallLayoutDemo */;
targetProxy = 029C0A38197E226600DA6FE9 /* PBXContainerItemProxy */;
};
B0253DA61BE3392600027A60 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = B0253D9F1BE3392600027A60 /* CollectionViewWaterfallLayout */;
targetProxy = B0253DA51BE3392600027A60 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
Expand Down Expand Up @@ -331,6 +431,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = WaterfallFlowLayout/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -344,6 +445,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = WaterfallFlowLayout/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 7.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down Expand Up @@ -388,6 +490,53 @@
};
name = Release;
};
B0253DA91BE3392600027A60 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = CollectionViewWaterfallLayout/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = ecerney.CollectionViewWaterfallLayout;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
B0253DAA1BE3392600027A60 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_NO_COMMON_BLOCKS = YES;
INFOPLIST_FILE = CollectionViewWaterfallLayout/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = ecerney.CollectionViewWaterfallLayout;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
Expand Down Expand Up @@ -418,6 +567,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B0253DAB1BE3392600027A60 /* Build configuration list for PBXNativeTarget "CollectionViewWaterfallLayout" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B0253DA91BE3392600027A60 /* Debug */,
B0253DAA1BE3392600027A60 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 029C0A1D197E226600DA6FE9 /* Project object */;
Expand Down