-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Add Carthage Support #55
Changes from all commits
001c067
e2789ea
488ddb2
df3bacc
723ab0b
8fd2ecc
31a37c8
9dbf320
771b105
1e0e164
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,6 +27,12 @@ | |
1899D27418BD201B0035A1B0 /* FBShimmering.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1899D26D18BD1D070035A1B0 /* FBShimmering.h */; }; | ||
1899D27518BD201B0035A1B0 /* FBShimmeringView.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1899D26818BD1CFB0035A1B0 /* FBShimmeringView.h */; }; | ||
1899D27618BD201B0035A1B0 /* FBShimmeringLayer.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1899D26A18BD1CFB0035A1B0 /* FBShimmeringLayer.h */; }; | ||
CECA74361C3D199800431EF8 /* Shimmer.h in Headers */ = {isa = PBXBuildFile; fileRef = CECA74351C3D199800431EF8 /* Shimmer.h */; settings = {ATTRIBUTES = (Public, ); }; }; | ||
CECA743D1C3D1C1700431EF8 /* FBShimmering.h in Headers */ = {isa = PBXBuildFile; fileRef = 1899D26D18BD1D070035A1B0 /* FBShimmering.h */; settings = {ATTRIBUTES = (Public, ); }; }; | ||
CECA743E1C3D1C1700431EF8 /* FBShimmeringView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1899D26818BD1CFB0035A1B0 /* FBShimmeringView.h */; settings = {ATTRIBUTES = (Public, ); }; }; | ||
CECA743F1C3D1C1700431EF8 /* FBShimmeringView.m in Sources */ = {isa = PBXBuildFile; fileRef = 1899D26718BD1CFB0035A1B0 /* FBShimmeringView.m */; }; | ||
CECA74401C3D1C1700431EF8 /* FBShimmeringLayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1899D26A18BD1CFB0035A1B0 /* FBShimmeringLayer.h */; settings = {ATTRIBUTES = (Public, ); }; }; | ||
CECA74411C3D1C1700431EF8 /* FBShimmeringLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 1899D26918BD1CFB0035A1B0 /* FBShimmeringLayer.m */; }; | ||
ECEA610218A49C620064AFF4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ECEA610118A49C620064AFF4 /* Foundation.framework */; }; | ||
/* End PBXBuildFile section */ | ||
|
||
|
@@ -62,6 +68,9 @@ | |
1899D26A18BD1CFB0035A1B0 /* FBShimmeringLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBShimmeringLayer.h; sourceTree = "<group>"; }; | ||
1899D26D18BD1D070035A1B0 /* FBShimmering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBShimmering.h; sourceTree = "<group>"; }; | ||
5CEF702BB5574A90B448BF09 /* libPods-FBShimmeringTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FBShimmeringTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
CECA74331C3D199800431EF8 /* Shimmer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Shimmer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; | ||
CECA74351C3D199800431EF8 /* Shimmer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Shimmer.h; sourceTree = "<group>"; }; | ||
CECA74371C3D199800431EF8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; | ||
EC8BB5B318A5A1EE00EB2793 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; }; | ||
EC8BB5B418A5A1F500EB2793 /* PATENTS */ = {isa = PBXFileReference; lastKnownFileType = text; path = PATENTS; sourceTree = "<group>"; }; | ||
EC8BB5B518A5A30700EB2793 /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = text; path = CONTRIBUTING.md; sourceTree = "<group>"; }; | ||
|
@@ -74,6 +83,13 @@ | |
/* End PBXFileReference section */ | ||
|
||
/* Begin PBXFrameworksBuildPhase section */ | ||
CECA742F1C3D199800431EF8 /* Frameworks */ = { | ||
isa = PBXFrameworksBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
ECEA60FB18A49C620064AFF4 /* Frameworks */ = { | ||
isa = PBXFrameworksBuildPhase; | ||
buildActionMask = 2147483647; | ||
|
@@ -85,6 +101,15 @@ | |
/* End PBXFrameworksBuildPhase section */ | ||
|
||
/* Begin PBXGroup section */ | ||
CECA74341C3D199800431EF8 /* Shimmer */ = { | ||
isa = PBXGroup; | ||
children = ( | ||
CECA74351C3D199800431EF8 /* Shimmer.h */, | ||
CECA74371C3D199800431EF8 /* Info.plist */, | ||
); | ||
path = Shimmer; | ||
sourceTree = "<group>"; | ||
}; | ||
ECEA60F518A49C620064AFF4 = { | ||
isa = PBXGroup; | ||
children = ( | ||
|
@@ -93,6 +118,7 @@ | |
EC8BB5B318A5A1EE00EB2793 /* LICENSE */, | ||
EC8BB5B418A5A1F500EB2793 /* PATENTS */, | ||
ECEA610318A49C620064AFF4 /* FBShimmering */, | ||
CECA74341C3D199800431EF8 /* Shimmer */, | ||
ECEA610018A49C620064AFF4 /* Frameworks */, | ||
ECEA60FF18A49C620064AFF4 /* Products */, | ||
); | ||
|
@@ -102,6 +128,7 @@ | |
isa = PBXGroup; | ||
children = ( | ||
ECEA60FE18A49C620064AFF4 /* libFBShimmering.a */, | ||
CECA74331C3D199800431EF8 /* Shimmer.framework */, | ||
); | ||
name = Products; | ||
sourceTree = "<group>"; | ||
|
@@ -140,7 +167,39 @@ | |
}; | ||
/* End PBXGroup section */ | ||
|
||
/* Begin PBXHeadersBuildPhase section */ | ||
CECA74301C3D199800431EF8 /* Headers */ = { | ||
isa = PBXHeadersBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
CECA743E1C3D1C1700431EF8 /* FBShimmeringView.h in Headers */, | ||
CECA74401C3D1C1700431EF8 /* FBShimmeringLayer.h in Headers */, | ||
CECA74361C3D199800431EF8 /* Shimmer.h in Headers */, | ||
CECA743D1C3D1C1700431EF8 /* FBShimmering.h in Headers */, | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
/* End PBXHeadersBuildPhase section */ | ||
|
||
/* Begin PBXNativeTarget section */ | ||
CECA74321C3D199800431EF8 /* Shimmer */ = { | ||
isa = PBXNativeTarget; | ||
buildConfigurationList = CECA743A1C3D199800431EF8 /* Build configuration list for PBXNativeTarget "Shimmer" */; | ||
buildPhases = ( | ||
CECA742E1C3D199800431EF8 /* Sources */, | ||
CECA742F1C3D199800431EF8 /* Frameworks */, | ||
CECA74301C3D199800431EF8 /* Headers */, | ||
CECA74311C3D199800431EF8 /* Resources */, | ||
); | ||
buildRules = ( | ||
); | ||
dependencies = ( | ||
); | ||
name = Shimmer; | ||
productName = Shimmer; | ||
productReference = CECA74331C3D199800431EF8 /* Shimmer.framework */; | ||
productType = "com.apple.product-type.framework"; | ||
}; | ||
ECEA60FD18A49C620064AFF4 /* FBShimmering */ = { | ||
isa = PBXNativeTarget; | ||
buildConfigurationList = ECEA612118A49C620064AFF4 /* Build configuration list for PBXNativeTarget "FBShimmering" */; | ||
|
@@ -167,6 +226,11 @@ | |
attributes = { | ||
LastUpgradeCheck = 0510; | ||
ORGANIZATIONNAME = "Kimon Tsinteris"; | ||
TargetAttributes = { | ||
CECA74321C3D199800431EF8 = { | ||
CreatedOnToolsVersion = 7.2; | ||
}; | ||
}; | ||
}; | ||
buildConfigurationList = ECEA60F918A49C620064AFF4 /* Build configuration list for PBXProject "FBShimmering" */; | ||
compatibilityVersion = "Xcode 3.2"; | ||
|
@@ -182,10 +246,21 @@ | |
targets = ( | ||
ECEA60FD18A49C620064AFF4 /* FBShimmering */, | ||
ECEA612C18A4A7360064AFF4 /* Framework */, | ||
CECA74321C3D199800431EF8 /* Shimmer */, | ||
); | ||
}; | ||
/* End PBXProject section */ | ||
|
||
/* Begin PBXResourcesBuildPhase section */ | ||
CECA74311C3D199800431EF8 /* Resources */ = { | ||
isa = PBXResourcesBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
/* End PBXResourcesBuildPhase section */ | ||
|
||
/* Begin PBXShellScriptBuildPhase section */ | ||
ECEA612718A49DDD0064AFF4 /* ShellScript */ = { | ||
isa = PBXShellScriptBuildPhase; | ||
|
@@ -216,6 +291,15 @@ | |
/* End PBXShellScriptBuildPhase section */ | ||
|
||
/* Begin PBXSourcesBuildPhase section */ | ||
CECA742E1C3D199800431EF8 /* Sources */ = { | ||
isa = PBXSourcesBuildPhase; | ||
buildActionMask = 2147483647; | ||
files = ( | ||
CECA74411C3D1C1700431EF8 /* FBShimmeringLayer.m in Sources */, | ||
CECA743F1C3D1C1700431EF8 /* FBShimmeringView.m in Sources */, | ||
); | ||
runOnlyForDeploymentPostprocessing = 0; | ||
}; | ||
ECEA60FA18A49C620064AFF4 /* Sources */ = { | ||
isa = PBXSourcesBuildPhase; | ||
buildActionMask = 2147483647; | ||
|
@@ -236,6 +320,65 @@ | |
/* End PBXTargetDependency section */ | ||
|
||
/* Begin XCBuildConfiguration section */ | ||
CECA74381C3D199800431EF8 /* Debug */ = { | ||
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
CLANG_WARN_UNREACHABLE_CODE = YES; | ||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | ||
CURRENT_PROJECT_VERSION = 1; | ||
DEBUG_INFORMATION_FORMAT = dwarf; | ||
DEFINES_MODULE = YES; | ||
DYLIB_COMPATIBILITY_VERSION = 1; | ||
DYLIB_CURRENT_VERSION = 1; | ||
DYLIB_INSTALL_NAME_BASE = "@rpath"; | ||
ENABLE_STRICT_OBJC_MSGSEND = YES; | ||
ENABLE_TESTABILITY = YES; | ||
GCC_NO_COMMON_BLOCKS = YES; | ||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; | ||
INFOPLIST_FILE = Shimmer/Info.plist; | ||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; | ||
IPHONEOS_DEPLOYMENT_TARGET = 8.0; | ||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; | ||
MTL_ENABLE_DEBUG_INFO = YES; | ||
PRODUCT_BUNDLE_IDENTIFIER = com.vialatte.Shimmer; | ||
PRODUCT_NAME = "$(TARGET_NAME)"; | ||
SKIP_INSTALL = YES; | ||
SWIFT_OPTIMIZATION_LEVEL = "-Onone"; | ||
TARGETED_DEVICE_FAMILY = "1,2"; | ||
VERSIONING_SYSTEM = "apple-generic"; | ||
VERSION_INFO_PREFIX = ""; | ||
}; | ||
name = Debug; | ||
}; | ||
CECA74391C3D199800431EF8 /* Release */ = { | ||
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
CLANG_WARN_UNREACHABLE_CODE = YES; | ||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; | ||
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"; | ||
ENABLE_STRICT_OBJC_MSGSEND = YES; | ||
GCC_NO_COMMON_BLOCKS = YES; | ||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; | ||
INFOPLIST_FILE = Shimmer/Info.plist; | ||
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; | ||
IPHONEOS_DEPLOYMENT_TARGET = 8.0; | ||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; | ||
MTL_ENABLE_DEBUG_INFO = NO; | ||
PRODUCT_BUNDLE_IDENTIFIER = com.vialatte.Shimmer; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think this is the right bundle identifier — perhaps |
||
PRODUCT_NAME = "$(TARGET_NAME)"; | ||
SKIP_INSTALL = YES; | ||
TARGETED_DEVICE_FAMILY = "1,2"; | ||
VERSIONING_SYSTEM = "apple-generic"; | ||
VERSION_INFO_PREFIX = ""; | ||
}; | ||
name = Release; | ||
}; | ||
ECEA611F18A49C620064AFF4 /* Debug */ = { | ||
isa = XCBuildConfiguration; | ||
buildSettings = { | ||
|
@@ -353,6 +496,15 @@ | |
/* End XCBuildConfiguration section */ | ||
|
||
/* Begin XCConfigurationList section */ | ||
CECA743A1C3D199800431EF8 /* Build configuration list for PBXNativeTarget "Shimmer" */ = { | ||
isa = XCConfigurationList; | ||
buildConfigurations = ( | ||
CECA74381C3D199800431EF8 /* Debug */, | ||
CECA74391C3D199800431EF8 /* Release */, | ||
); | ||
defaultConfigurationIsVisible = 0; | ||
defaultConfigurationName = Release; | ||
}; | ||
ECEA60F918A49C620064AFF4 /* Build configuration list for PBXProject "FBShimmering" */ = { | ||
isa = XCConfigurationList; | ||
buildConfigurations = ( | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<Scheme | ||
LastUpgradeVersion = "0720" | ||
version = "1.3"> | ||
<BuildAction | ||
parallelizeBuildables = "YES" | ||
buildImplicitDependencies = "YES"> | ||
<BuildActionEntries> | ||
<BuildActionEntry | ||
buildForTesting = "YES" | ||
buildForRunning = "YES" | ||
buildForProfiling = "YES" | ||
buildForArchiving = "YES" | ||
buildForAnalyzing = "YES"> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "CECA74321C3D199800431EF8" | ||
BuildableName = "Shimmer.framework" | ||
BlueprintName = "Shimmer" | ||
ReferencedContainer = "container:FBShimmering.xcodeproj"> | ||
</BuildableReference> | ||
</BuildActionEntry> | ||
</BuildActionEntries> | ||
</BuildAction> | ||
<TestAction | ||
buildConfiguration = "Debug" | ||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
shouldUseLaunchSchemeArgsEnv = "YES"> | ||
<Testables> | ||
</Testables> | ||
<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"> | ||
<MacroExpansion> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "CECA74321C3D199800431EF8" | ||
BuildableName = "Shimmer.framework" | ||
BlueprintName = "Shimmer" | ||
ReferencedContainer = "container:FBShimmering.xcodeproj"> | ||
</BuildableReference> | ||
</MacroExpansion> | ||
<AdditionalOptions> | ||
</AdditionalOptions> | ||
</LaunchAction> | ||
<ProfileAction | ||
buildConfiguration = "Release" | ||
shouldUseLaunchSchemeArgsEnv = "YES" | ||
savedToolIdentifier = "" | ||
useCustomWorkingDirectory = "NO" | ||
debugDocumentVersioning = "YES"> | ||
<MacroExpansion> | ||
<BuildableReference | ||
BuildableIdentifier = "primary" | ||
BlueprintIdentifier = "CECA74321C3D199800431EF8" | ||
BuildableName = "Shimmer.framework" | ||
BlueprintName = "Shimmer" | ||
ReferencedContainer = "container:FBShimmering.xcodeproj"> | ||
</BuildableReference> | ||
</MacroExpansion> | ||
</ProfileAction> | ||
<AnalyzeAction | ||
buildConfiguration = "Debug"> | ||
</AnalyzeAction> | ||
<ArchiveAction | ||
buildConfiguration = "Release" | ||
revealArchiveInOrganizer = "YES"> | ||
</ArchiveAction> | ||
</Scheme> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,8 @@ There's also an example project. In the example, you can swipe horizontally and | |
There are two options: | ||
|
||
1. Shimmer is available as `Shimmer` in [Cocoapods](http://cocoapods.org). | ||
2. Manually add the files into your Xcode project. Slightly simpler, but updates are also manual. | ||
2. Shimmer is available as `github "facebook/Shimmer"` in [Carthage](https://github.com/Carthage/Carthage). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would avoid adding this here. I'm happy to merge pull requests to add them, but maintaining opaque Xcode projects isn't something I think we can guarantee to work for future releases. |
||
3. Manually add the files into your Xcode project. Slightly simpler, but updates are also manual. | ||
|
||
Shimmer requires iOS 6 or later. | ||
|
||
|
@@ -45,4 +46,3 @@ See the CONTRIBUTING file for how to help out. | |
|
||
## License | ||
Shimmer is BSD-licensed. We also provide an additional patent grant. | ||
|
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> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// | ||
// Shimmer.h | ||
// Shimmer | ||
// | ||
// Created by Allan Vialatte on 06/01/2016. | ||
// Copyright © 2016 Kimon Tsinteris. All rights reserved. | ||
// | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you update this copyright header to match the other ones? |
||
|
||
#import <UIKit/UIKit.h> | ||
|
||
//! Project version number for Shimmer. | ||
FOUNDATION_EXPORT double ShimmerVersionNumber; | ||
|
||
//! Project version string for Shimmer. | ||
FOUNDATION_EXPORT const unsigned char ShimmerVersionString[]; | ||
|
||
// In this header, you should import all the public headers of your framework using statements like #import <Shimmer/PublicHeader.h> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this line could be removed. |
||
|
||
|
||
#import <Shimmer/FBShimmering.h> | ||
#import <Shimmer/FBShimmeringView.h> | ||
#import <Shimmer/FBShimmeringLayer.h> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this block useful? I think it should be safe to remove.