From df3c7e04e077626c66b82bb993b1d8043840a838 Mon Sep 17 00:00:00 2001 From: Luis Padron Date: Thu, 27 Oct 2016 17:25:33 -0400 Subject: [PATCH] update pod in example proj to 1.1.2 --- Example/Podfile.lock | 6 ++-- Example/Pods/Manifest.lock | 6 ++-- Example/Pods/Pods.xcodeproj/project.pbxproj | 28 +++++++++---------- .../Pods-Example/Pods-Example-resources.sh | 10 ++----- .../Pods-Example/Pods-Example-umbrella.h | 2 ++ .../UICircularProgressRing/Info.plist | 2 +- .../UICircularProgressRing-umbrella.h | 2 ++ .../UICircularProgressRingView.swift | 4 +++ 8 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index b1899fe6..466659ff 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,12 +1,12 @@ PODS: - - UICircularProgressRing (1.1.1) + - UICircularProgressRing (1.1.2) DEPENDENCIES: - UICircularProgressRing SPEC CHECKSUMS: - UICircularProgressRing: c37697577b2f07841fa901ad162959f6f5530204 + UICircularProgressRing: fc2fc5da06d0173b4edff1d3f4dc26ae8b2c2d80 PODFILE CHECKSUM: bff4735b1f3d9f2f90f144e8cc121cf8af67e40b -COCOAPODS: 1.1.0.rc.2 +COCOAPODS: 1.1.1 diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index b1899fe6..466659ff 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,12 +1,12 @@ PODS: - - UICircularProgressRing (1.1.1) + - UICircularProgressRing (1.1.2) DEPENDENCIES: - UICircularProgressRing SPEC CHECKSUMS: - UICircularProgressRing: c37697577b2f07841fa901ad162959f6f5530204 + UICircularProgressRing: fc2fc5da06d0173b4edff1d3f4dc26ae8b2c2d80 PODFILE CHECKSUM: bff4735b1f3d9f2f90f144e8cc121cf8af67e40b -COCOAPODS: 1.1.0.rc.2 +COCOAPODS: 1.1.1 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 96e81f57..4192e025 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -12,9 +12,9 @@ 26A2F21B0540E5A09CB34A8ED15C8F02 /* UICircularProgressRingLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEEFC5906D5ABEF47FF2EDA98C6D6777 /* UICircularProgressRingLayer.swift */; }; 2B97982B63A3B60D5C4EE5E17A0BE4DF /* UICircularProgressRing-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F4A069D61AEFAF2E4A4B64534619724 /* UICircularProgressRing-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3244CC2F09F083119DE3283096DF9953 /* Pods-Example-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = C9BDE82371C83FA9AE91B05F77ACAA36 /* Pods-Example-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 87F037F0906749F19BF96ABAE9A5CA1F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC22C73C1608DFA5D5D78BDCB218219 /* Foundation.framework */; }; + 8D3D3B9864984FF7A661A3B787D3E9A2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */; }; + B92E31E8416440B2D41FA530F55CC437 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */; }; C114D776F69698E24480FC8E858DE19F /* UICircularProgressRingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC12525258716F3105D6E9D4378CF105 /* UICircularProgressRingView.swift */; }; - CF90BB2B3320D5590D286E9C14304251 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC22C73C1608DFA5D5D78BDCB218219 /* Foundation.framework */; }; D346221206F47E5C208244FB18C40C86 /* UICircularProgressRing-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = DB44F6FB571FA9FDBF5FBC41FA2BAB25 /* UICircularProgressRing-dummy.m */; }; DB0F3DB8C45F803942A8089C7E427110 /* UICircularProgressRingDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 786409A9053F7345994F830ADED7D0A4 /* UICircularProgressRingDelegate.swift */; }; /* End PBXBuildFile section */ @@ -49,8 +49,8 @@ AEEFC5906D5ABEF47FF2EDA98C6D6777 /* UICircularProgressRingLayer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = UICircularProgressRingLayer.swift; path = UICircularProgressRing/UICircularProgressRingLayer.swift; sourceTree = ""; }; AF65A6B405B500CF6F19259E996FA855 /* UICircularProgressRing.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = UICircularProgressRing.xcconfig; sourceTree = ""; }; C9BDE82371C83FA9AE91B05F77ACAA36 /* Pods-Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Example-umbrella.h"; sourceTree = ""; }; + CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; CC12525258716F3105D6E9D4378CF105 /* UICircularProgressRingView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = UICircularProgressRingView.swift; path = UICircularProgressRing/UICircularProgressRingView.swift; sourceTree = ""; }; - CEC22C73C1608DFA5D5D78BDCB218219 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; DB44F6FB571FA9FDBF5FBC41FA2BAB25 /* UICircularProgressRing-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "UICircularProgressRing-dummy.m"; sourceTree = ""; }; E512A5F985F876750237FD237C3AEEDA /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Example.release.xcconfig"; sourceTree = ""; }; EFFB74AAA6B2AE8DABF0E88E61E09178 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -61,7 +61,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 87F037F0906749F19BF96ABAE9A5CA1F /* Foundation.framework in Frameworks */, + B92E31E8416440B2D41FA530F55CC437 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -69,21 +69,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CF90BB2B3320D5590D286E9C14304251 /* Foundation.framework in Frameworks */, + 8D3D3B9864984FF7A661A3B787D3E9A2 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 3DCAB2B7CDE207B3958B6CB957FCC758 /* iOS */ = { - isa = PBXGroup; - children = ( - CEC22C73C1608DFA5D5D78BDCB218219 /* Foundation.framework */, - ); - name = iOS; - sourceTree = ""; - }; 674964DA1B35186696046900827F2AE1 /* Products */ = { isa = PBXGroup; children = ( @@ -101,6 +93,14 @@ name = "Targets Support Files"; sourceTree = ""; }; + 7531C8F8DE19F1AA3C8A7AC97A91DC29 /* iOS */ = { + isa = PBXGroup; + children = ( + CBB3DE36805AF21409EC968A9691732F /* Foundation.framework */, + ); + name = iOS; + sourceTree = ""; + }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( @@ -135,7 +135,7 @@ BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */ = { isa = PBXGroup; children = ( - 3DCAB2B7CDE207B3958B6CB957FCC758 /* iOS */, + 7531C8F8DE19F1AA3C8A7AC97A91DC29 /* iOS */, ); name = Frameworks; sourceTree = ""; diff --git a/Example/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh b/Example/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh index 0a156152..25e9d377 100755 --- a/Example/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh +++ b/Example/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh @@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in ;; esac -realpath() { - DIRECTORY="$(cd "${1%/*}" && pwd)" - FILENAME="${1##*/}" - echo "$DIRECTORY/$FILENAME" -} - install_resource() { if [[ "$1" = /* ]] ; then @@ -70,7 +64,7 @@ EOM xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") + ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH" XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; *) @@ -93,7 +87,7 @@ then # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do - if [[ $line != "`realpath $PODS_ROOT`*" ]]; then + if [[ $line != "${PODS_ROOT}*" ]]; then XCASSET_FILES+=("$line") fi done <<<"$OTHER_XCASSETS" diff --git a/Example/Pods/Target Support Files/Pods-Example/Pods-Example-umbrella.h b/Example/Pods/Target Support Files/Pods-Example/Pods-Example-umbrella.h index 09826d78..200a8e1b 100644 --- a/Example/Pods/Target Support Files/Pods-Example/Pods-Example-umbrella.h +++ b/Example/Pods/Target Support Files/Pods-Example/Pods-Example-umbrella.h @@ -1,4 +1,6 @@ +#ifdef __OBJC__ #import +#endif FOUNDATION_EXPORT double Pods_ExampleVersionNumber; diff --git a/Example/Pods/Target Support Files/UICircularProgressRing/Info.plist b/Example/Pods/Target Support Files/UICircularProgressRing/Info.plist index d60f138d..7ea8235e 100644 --- a/Example/Pods/Target Support Files/UICircularProgressRing/Info.plist +++ b/Example/Pods/Target Support Files/UICircularProgressRing/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.1.1 + 1.1.2 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-umbrella.h b/Example/Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-umbrella.h index 8c95cef5..336dc4c9 100644 --- a/Example/Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-umbrella.h +++ b/Example/Pods/Target Support Files/UICircularProgressRing/UICircularProgressRing-umbrella.h @@ -1,4 +1,6 @@ +#ifdef __OBJC__ #import +#endif #import "UICircularProgressRing.h" diff --git a/Example/Pods/UICircularProgressRing/UICircularProgressRing/UICircularProgressRingView.swift b/Example/Pods/UICircularProgressRing/UICircularProgressRing/UICircularProgressRingView.swift index f9c5783f..b67eb9b6 100644 --- a/Example/Pods/UICircularProgressRing/UICircularProgressRing/UICircularProgressRingView.swift +++ b/Example/Pods/UICircularProgressRing/UICircularProgressRing/UICircularProgressRingView.swift @@ -533,6 +533,10 @@ import UIKit */ private func initialize() { + // Helps with pixelation and blurriness on retina devices + self.layer.contentsScale = UIScreen.main.scale + self.layer.shouldRasterize = true + self.layer.rasterizationScale = UIScreen.main.scale * 2 self.ringLayer.value = value self.ringLayer.maxValue = maxValue self.ringLayer.viewStyle = viewStyle