From cab7618fbe60b1700d469e1bdc040f672547a3b8 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 10 Aug 2015 11:37:13 +1000 Subject: [PATCH 1/7] Hiding carthage build dir --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index eda65ad..63fcfd3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,6 @@ build/ # Backup files *~.nib -/ graphics/ \ No newline at end of file +/ graphics/ + +Carthage/Build From acbd288f0c73ac934716fd0462038fda09a14cf1 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 10 Aug 2015 11:56:04 +1000 Subject: [PATCH 2/7] Adding project to build a framework for Carthage. --- DACircularProgress.xcodeproj/project.pbxproj | 299 ++++++++++++++++++ .../xcschemes/DACircularProgress.xcscheme | 80 +++++ DACircularProgress/DACircularProgress.h | 18 ++ Info.plist | 26 ++ 4 files changed, 423 insertions(+) create mode 100644 DACircularProgress.xcodeproj/project.pbxproj create mode 100644 DACircularProgress.xcodeproj/xcshareddata/xcschemes/DACircularProgress.xcscheme create mode 100644 DACircularProgress/DACircularProgress.h create mode 100644 Info.plist diff --git a/DACircularProgress.xcodeproj/project.pbxproj b/DACircularProgress.xcodeproj/project.pbxproj new file mode 100644 index 0000000..a3e5900 --- /dev/null +++ b/DACircularProgress.xcodeproj/project.pbxproj @@ -0,0 +1,299 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 6C55C7EE1B783AA7006A7440 /* DACircularProgressView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7EA1B783AA7006A7440 /* DACircularProgressView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C55C7EF1B783AA7006A7440 /* DACircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */; }; + 6C55C7F01B783AA7006A7440 /* DALabeledCircularProgressView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C55C7F11B783AA7006A7440 /* DALabeledCircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */; }; + 6C55C7F31B783B42006A7440 /* DACircularProgress.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7F21B783B42006A7440 /* DACircularProgress.h */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 6C55C7DF1B783A23006A7440 /* DACircularProgress.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DACircularProgress.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6C55C7E41B783A23006A7440 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 6C55C7EA1B783AA7006A7440 /* DACircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DACircularProgressView.h; sourceTree = ""; }; + 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DACircularProgressView.m; sourceTree = ""; }; + 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DALabeledCircularProgressView.h; sourceTree = ""; }; + 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DALabeledCircularProgressView.m; sourceTree = ""; }; + 6C55C7F21B783B42006A7440 /* DACircularProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DACircularProgress.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 6C55C7DB1B783A23006A7440 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 6C55C7D51B783A23006A7440 = { + isa = PBXGroup; + children = ( + 6C55C7E41B783A23006A7440 /* Info.plist */, + 6C55C7E11B783A23006A7440 /* DACircularProgress */, + 6C55C7E01B783A23006A7440 /* Products */, + ); + sourceTree = ""; + }; + 6C55C7E01B783A23006A7440 /* Products */ = { + isa = PBXGroup; + children = ( + 6C55C7DF1B783A23006A7440 /* DACircularProgress.framework */, + ); + name = Products; + sourceTree = ""; + }; + 6C55C7E11B783A23006A7440 /* DACircularProgress */ = { + isa = PBXGroup; + children = ( + 6C55C7EA1B783AA7006A7440 /* DACircularProgressView.h */, + 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */, + 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */, + 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */, + 6C55C7F21B783B42006A7440 /* DACircularProgress.h */, + ); + path = DACircularProgress; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 6C55C7DC1B783A23006A7440 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C55C7F31B783B42006A7440 /* DACircularProgress.h in Headers */, + 6C55C7F01B783AA7006A7440 /* DALabeledCircularProgressView.h in Headers */, + 6C55C7EE1B783AA7006A7440 /* DACircularProgressView.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 6C55C7DE1B783A23006A7440 /* DACircularProgress */ = { + isa = PBXNativeTarget; + buildConfigurationList = 6C55C7E71B783A23006A7440 /* Build configuration list for PBXNativeTarget "DACircularProgress" */; + buildPhases = ( + 6C55C7DA1B783A23006A7440 /* Sources */, + 6C55C7DB1B783A23006A7440 /* Frameworks */, + 6C55C7DC1B783A23006A7440 /* Headers */, + 6C55C7DD1B783A23006A7440 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = DACircularProgress; + productName = DACircularProgress; + productReference = 6C55C7DF1B783A23006A7440 /* DACircularProgress.framework */; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 6C55C7D61B783A23006A7440 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0700; + ORGANIZATIONNAME = "Daniel Amitay"; + TargetAttributes = { + 6C55C7DE1B783A23006A7440 = { + CreatedOnToolsVersion = 7.0; + }; + }; + }; + buildConfigurationList = 6C55C7D91B783A23006A7440 /* Build configuration list for PBXProject "DACircularProgress" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 6C55C7D51B783A23006A7440; + productRefGroup = 6C55C7E01B783A23006A7440 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 6C55C7DE1B783A23006A7440 /* DACircularProgress */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 6C55C7DD1B783A23006A7440 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 6C55C7DA1B783A23006A7440 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 6C55C7EF1B783AA7006A7440 /* DACircularProgressView.m in Sources */, + 6C55C7F11B783AA7006A7440 /* DALabeledCircularProgressView.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 6C55C7E51B783A23006A7440 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 6C55C7E61B783A23006A7440 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 6C55C7E81B783A23006A7440 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.danielamitay.DACircularProgress; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 6C55C7E91B783A23006A7440 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.danielamitay.DACircularProgress; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 6C55C7D91B783A23006A7440 /* Build configuration list for PBXProject "DACircularProgress" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6C55C7E51B783A23006A7440 /* Debug */, + 6C55C7E61B783A23006A7440 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 6C55C7E71B783A23006A7440 /* Build configuration list for PBXNativeTarget "DACircularProgress" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 6C55C7E81B783A23006A7440 /* Debug */, + 6C55C7E91B783A23006A7440 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 6C55C7D61B783A23006A7440 /* Project object */; +} diff --git a/DACircularProgress.xcodeproj/xcshareddata/xcschemes/DACircularProgress.xcscheme b/DACircularProgress.xcodeproj/xcshareddata/xcschemes/DACircularProgress.xcscheme new file mode 100644 index 0000000..0e19289 --- /dev/null +++ b/DACircularProgress.xcodeproj/xcshareddata/xcschemes/DACircularProgress.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DACircularProgress/DACircularProgress.h b/DACircularProgress/DACircularProgress.h new file mode 100644 index 0000000..3b75a73 --- /dev/null +++ b/DACircularProgress/DACircularProgress.h @@ -0,0 +1,18 @@ +// +// DACircularProgress.h +// DACircularProgress +// +// Created by Derek Clarkson on 10/08/2015. +// Copyright © 2015 Daniel Amitay. All rights reserved. +// + +@import Foundation; + +//! Project version number for DACircularProgress. +FOUNDATION_EXPORT double daCircularProgressVersionNumber; + +//! Project version string for DACircularProgress. +FOUNDATION_EXPORT const unsigned char daCircularProgressVersionString[]; + +#import +#import \ No newline at end of file diff --git a/Info.plist b/Info.plist new file mode 100644 index 0000000..d3de8ee --- /dev/null +++ b/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSPrincipalClass + + + From 2917f0d862269f05a3b1b07e177842655620422d Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 10 Aug 2015 12:10:27 +1000 Subject: [PATCH 3/7] Updating framework header file. --- DACircularProgress.xcodeproj/project.pbxproj | 8 ++++---- .../{DACircularProgress.h => CircularProgress.h} | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename DACircularProgress/{DACircularProgress.h => CircularProgress.h} (75%) diff --git a/DACircularProgress.xcodeproj/project.pbxproj b/DACircularProgress.xcodeproj/project.pbxproj index a3e5900..9cac98f 100644 --- a/DACircularProgress.xcodeproj/project.pbxproj +++ b/DACircularProgress.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 6C55C7EF1B783AA7006A7440 /* DACircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */; }; 6C55C7F01B783AA7006A7440 /* DALabeledCircularProgressView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6C55C7F11B783AA7006A7440 /* DALabeledCircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */; }; - 6C55C7F31B783B42006A7440 /* DACircularProgress.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7F21B783B42006A7440 /* DACircularProgress.h */; }; + 6C55C7F31B783B42006A7440 /* CircularProgress.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7F21B783B42006A7440 /* CircularProgress.h */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -21,7 +21,7 @@ 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DACircularProgressView.m; sourceTree = ""; }; 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DALabeledCircularProgressView.h; sourceTree = ""; }; 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DALabeledCircularProgressView.m; sourceTree = ""; }; - 6C55C7F21B783B42006A7440 /* DACircularProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DACircularProgress.h; sourceTree = ""; }; + 6C55C7F21B783B42006A7440 /* CircularProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularProgress.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -59,7 +59,7 @@ 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */, 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */, 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */, - 6C55C7F21B783B42006A7440 /* DACircularProgress.h */, + 6C55C7F21B783B42006A7440 /* CircularProgress.h */, ); path = DACircularProgress; sourceTree = ""; @@ -71,7 +71,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 6C55C7F31B783B42006A7440 /* DACircularProgress.h in Headers */, + 6C55C7F31B783B42006A7440 /* CircularProgress.h in Headers */, 6C55C7F01B783AA7006A7440 /* DALabeledCircularProgressView.h in Headers */, 6C55C7EE1B783AA7006A7440 /* DACircularProgressView.h in Headers */, ); diff --git a/DACircularProgress/DACircularProgress.h b/DACircularProgress/CircularProgress.h similarity index 75% rename from DACircularProgress/DACircularProgress.h rename to DACircularProgress/CircularProgress.h index 3b75a73..b60b954 100644 --- a/DACircularProgress/DACircularProgress.h +++ b/DACircularProgress/CircularProgress.h @@ -9,10 +9,10 @@ @import Foundation; //! Project version number for DACircularProgress. -FOUNDATION_EXPORT double daCircularProgressVersionNumber; +FOUNDATION_EXPORT double circularProgressVersionNumber; //! Project version string for DACircularProgress. -FOUNDATION_EXPORT const unsigned char daCircularProgressVersionString[]; +FOUNDATION_EXPORT const unsigned char circularProgressVersionString[]; #import #import \ No newline at end of file From ac6c312db363e5f0455c63f9723b22d272dc0404 Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 10 Aug 2015 12:21:18 +1000 Subject: [PATCH 4/7] Udpating readme --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index c39f44b..37e79fc 100755 --- a/README.md +++ b/README.md @@ -10,6 +10,18 @@ View the included example project for a demonstration. ## Installation +### Carthage +[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) + +DACircularProgress is fully Carthage compatible. It can then be included using this import: + +```objectivec +@import QuartzCore; +#import +``` + +### Manual + To use `DACircularProgress`: - Copy over the `DACircularProgress` folder to your project folder. From 375e8ad83548fa48945df7a776de8fa4b717b14b Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 10 Aug 2015 12:28:47 +1000 Subject: [PATCH 5/7] Updating readme. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 37e79fc..685ed1e 100755 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ View the included example project for a demonstration. ### Carthage [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) -DACircularProgress is fully Carthage compatible. It can then be included using this import: +DACircularProgress is fully Carthage compatible. To include it, build you project with Carthage, then drag **./Carthage/Build/iOS/DACircularProgress.framework** into you project and add this import: ```objectivec @import QuartzCore; From 3fae968c501a3e93df0f3fce4fa943bdfe90fb5f Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 10 Aug 2015 14:04:50 +1000 Subject: [PATCH 6/7] Udpating framwork header. --- DACircularProgress.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DACircularProgress.xcodeproj/project.pbxproj b/DACircularProgress.xcodeproj/project.pbxproj index 9cac98f..b1b2eff 100644 --- a/DACircularProgress.xcodeproj/project.pbxproj +++ b/DACircularProgress.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 6C55C7EF1B783AA7006A7440 /* DACircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */; }; 6C55C7F01B783AA7006A7440 /* DALabeledCircularProgressView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6C55C7F11B783AA7006A7440 /* DALabeledCircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */; }; - 6C55C7F31B783B42006A7440 /* CircularProgress.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7F21B783B42006A7440 /* CircularProgress.h */; }; + 6C55C7F31B783B42006A7440 /* CircularProgress.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7F21B783B42006A7440 /* CircularProgress.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ From b636d36b7589be6e9584ab3231587b3a06f383dc Mon Sep 17 00:00:00 2001 From: Derek Clarkson Date: Mon, 10 Aug 2015 14:17:39 +1000 Subject: [PATCH 7/7] Fixing issues with umbrella header not registering correctly. Seems to be a naming issues. But not sure. --- DACircularProgress.xcodeproj/project.pbxproj | 8 ++++---- .../{CircularProgress.h => DACircularProgress.h} | 4 ++-- README.md | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename DACircularProgress/{CircularProgress.h => DACircularProgress.h} (75%) diff --git a/DACircularProgress.xcodeproj/project.pbxproj b/DACircularProgress.xcodeproj/project.pbxproj index b1b2eff..8f8cbdb 100644 --- a/DACircularProgress.xcodeproj/project.pbxproj +++ b/DACircularProgress.xcodeproj/project.pbxproj @@ -11,7 +11,7 @@ 6C55C7EF1B783AA7006A7440 /* DACircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */; }; 6C55C7F01B783AA7006A7440 /* DALabeledCircularProgressView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6C55C7F11B783AA7006A7440 /* DALabeledCircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */; }; - 6C55C7F31B783B42006A7440 /* CircularProgress.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7F21B783B42006A7440 /* CircularProgress.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 6C55C7F31B783B42006A7440 /* DACircularProgress.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C55C7F21B783B42006A7440 /* DACircularProgress.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -21,7 +21,7 @@ 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DACircularProgressView.m; sourceTree = ""; }; 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DALabeledCircularProgressView.h; sourceTree = ""; }; 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DALabeledCircularProgressView.m; sourceTree = ""; }; - 6C55C7F21B783B42006A7440 /* CircularProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularProgress.h; sourceTree = ""; }; + 6C55C7F21B783B42006A7440 /* DACircularProgress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DACircularProgress.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -59,7 +59,7 @@ 6C55C7EB1B783AA7006A7440 /* DACircularProgressView.m */, 6C55C7EC1B783AA7006A7440 /* DALabeledCircularProgressView.h */, 6C55C7ED1B783AA7006A7440 /* DALabeledCircularProgressView.m */, - 6C55C7F21B783B42006A7440 /* CircularProgress.h */, + 6C55C7F21B783B42006A7440 /* DACircularProgress.h */, ); path = DACircularProgress; sourceTree = ""; @@ -71,7 +71,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 6C55C7F31B783B42006A7440 /* CircularProgress.h in Headers */, + 6C55C7F31B783B42006A7440 /* DACircularProgress.h in Headers */, 6C55C7F01B783AA7006A7440 /* DALabeledCircularProgressView.h in Headers */, 6C55C7EE1B783AA7006A7440 /* DACircularProgressView.h in Headers */, ); diff --git a/DACircularProgress/CircularProgress.h b/DACircularProgress/DACircularProgress.h similarity index 75% rename from DACircularProgress/CircularProgress.h rename to DACircularProgress/DACircularProgress.h index b60b954..c74faaf 100644 --- a/DACircularProgress/CircularProgress.h +++ b/DACircularProgress/DACircularProgress.h @@ -9,10 +9,10 @@ @import Foundation; //! Project version number for DACircularProgress. -FOUNDATION_EXPORT double circularProgressVersionNumber; +FOUNDATION_EXPORT double DACircularProgressVersionNumber; //! Project version string for DACircularProgress. -FOUNDATION_EXPORT const unsigned char circularProgressVersionString[]; +FOUNDATION_EXPORT const unsigned char DACircularProgressVersionString[]; #import #import \ No newline at end of file diff --git a/README.md b/README.md index 685ed1e..6134860 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ DACircularProgress is fully Carthage compatible. To include it, build you projec ```objectivec @import QuartzCore; -#import +#import ``` ### Manual