diff --git a/CHANGELOG.md b/CHANGELOG.md index c3e4ae3..a1b9e2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# 2.1.2 + +- Fixed drawing issue where `touchDrawView` and `imageView` bounds + didn't line up (thanks to @mkoorn!) +- Change base class to `UIImageView` + # 2.1.1 - Upgrades project to Swift 4 (thanks to @codyaweber!) diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index c508926..7e8fa49 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - TouchDraw (2.1.1) + - TouchDraw (2.1.2) DEPENDENCIES: - TouchDraw (from `../`) EXTERNAL SOURCES: TouchDraw: - :path: ../ + :path: "../" SPEC CHECKSUMS: - TouchDraw: b742ebbc96d85f1df1f093ce3aad50e667533edf + TouchDraw: 02074f86f08957eceb8ee3012b6b8740405e6109 PODFILE CHECKSUM: f850bd72d12b5fb4f18cad822d3a3481b9ad2931 -COCOAPODS: 1.3.1 +COCOAPODS: 1.5.3 diff --git a/Demo/Pods/Local Podspecs/TouchDraw.podspec.json b/Demo/Pods/Local Podspecs/TouchDraw.podspec.json index 0ea5eeb..fc7293d 100644 --- a/Demo/Pods/Local Podspecs/TouchDraw.podspec.json +++ b/Demo/Pods/Local Podspecs/TouchDraw.podspec.json @@ -1,6 +1,6 @@ { "name": "TouchDraw", - "version": "2.1.1", + "version": "2.1.2", "summary": "TouchDraw is a UIView you can draw on.", "description": "TouchDraw is a subclass of UIView that allows you to draw using touch. It exposes the following functions:\n- `exportDrawing() -> UIImage`\n- `clearDrawing()`\n- `undo()`\n- `redo()`\n- `setColor(color: UIColor?)`\n- `setWidth(width: CGFloat)`\n- `importStack(stack: [Stroke])`\n- `exportStack() -> [Stroke]`", "homepage": "https://github.com/dehli/TouchDraw", @@ -17,7 +17,7 @@ }, "source": { "git": "https://github.com/dehli/TouchDraw.git", - "tag": "2.1.1" + "tag": "2.1.2" }, "source_files": "Sources/**/*.{swift}" } diff --git a/Demo/Pods/Manifest.lock b/Demo/Pods/Manifest.lock index c508926..7e8fa49 100644 --- a/Demo/Pods/Manifest.lock +++ b/Demo/Pods/Manifest.lock @@ -1,16 +1,16 @@ PODS: - - TouchDraw (2.1.1) + - TouchDraw (2.1.2) DEPENDENCIES: - TouchDraw (from `../`) EXTERNAL SOURCES: TouchDraw: - :path: ../ + :path: "../" SPEC CHECKSUMS: - TouchDraw: b742ebbc96d85f1df1f093ce3aad50e667533edf + TouchDraw: 02074f86f08957eceb8ee3012b6b8740405e6109 PODFILE CHECKSUM: f850bd72d12b5fb4f18cad822d3a3481b9ad2931 -COCOAPODS: 1.3.1 +COCOAPODS: 1.5.3 diff --git a/Demo/Pods/Pods.xcodeproj/project.pbxproj b/Demo/Pods/Pods.xcodeproj/project.pbxproj index c1be80c..482307d 100644 --- a/Demo/Pods/Pods.xcodeproj/project.pbxproj +++ b/Demo/Pods/Pods.xcodeproj/project.pbxproj @@ -7,15 +7,15 @@ objects = { /* Begin PBXBuildFile section */ - 0CD64BAC06FAFB571E7DE46E7F00885B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; - 1A06261ECC24E3CF4E0128AB1EEC67C9 /* Pods-TouchDrawDemo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = CBC988718E777FB697734C63A39A91A8 /* Pods-TouchDrawDemo-dummy.m */; }; - 540DA4C977BB1EB83AC3429456AB57A7 /* Stroke.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB8967C7ACE218DC0B8D555B514A561B /* Stroke.swift */; }; - 77B489A6B667A67FB29CAF772249E8F2 /* TouchDrawView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD7B3A7D582356DD34AC4424425907E /* TouchDrawView.swift */; }; - 89FCBC63F997A86D4E6C7DE16554F95A /* TouchDraw-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = D6E342EB953AE1AEEEDB48116DA7C7DC /* TouchDraw-dummy.m */; }; - D2896764543D11E9EF00D43E50832E8F /* Pods-TouchDrawDemo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 75F904ADA40E5F5391D0BD9BCAF4866D /* Pods-TouchDrawDemo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D75775C43EC30E2F9EEBC9C750958B93 /* StrokeSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F2BFECB3C3D09A2DA34D16E2B1FE0D0 /* StrokeSettings.swift */; }; - F30434CB38D87A55A32714821060AE84 /* TouchDraw-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 905F4C175DC4B6DCE59B564EED8B1B5A /* TouchDraw-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F3A17B478CA3B615EF5586F55403BC94 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */; }; + 14040A60A6D97C332289898D036FB0F4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A16F4CFC63FAC439D7A04994F579A03 /* Foundation.framework */; }; + 1A06261ECC24E3CF4E0128AB1EEC67C9 /* Pods-TouchDrawDemo-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = ED012F5343741B588913D37ADA0F208A /* Pods-TouchDrawDemo-dummy.m */; }; + 540DA4C977BB1EB83AC3429456AB57A7 /* Stroke.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5757E5834DC91823EF2209EC5711BFE1 /* Stroke.swift */; }; + 710137ADBBBF8A48C808244FC62D297F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A16F4CFC63FAC439D7A04994F579A03 /* Foundation.framework */; }; + 77B489A6B667A67FB29CAF772249E8F2 /* TouchDrawView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2FD25BF3696680CF183BDA514962A4E /* TouchDrawView.swift */; }; + 89FCBC63F997A86D4E6C7DE16554F95A /* TouchDraw-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5B11770B0463A6F855BE9BC66C0BE6 /* TouchDraw-dummy.m */; }; + D2896764543D11E9EF00D43E50832E8F /* Pods-TouchDrawDemo-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 690B6B972AA4BA0628F0108A4BA5C185 /* Pods-TouchDrawDemo-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D75775C43EC30E2F9EEBC9C750958B93 /* StrokeSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471D241AC2AE2D47DEF589BFBF6255BE /* StrokeSettings.swift */; }; + F30434CB38D87A55A32714821060AE84 /* TouchDraw-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CF7E4ABD9284152023AE9181F9559A4 /* TouchDraw-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -29,29 +29,32 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 09E9DFDA934DF7A7FA943F3812833E0D /* Pods-TouchDrawDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-TouchDrawDemo.release.xcconfig"; sourceTree = ""; }; - 2A5CB2191B4ED139378010C9C8A0FF49 /* Pods-TouchDrawDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-TouchDrawDemo.debug.xcconfig"; sourceTree = ""; }; - 2F2BFECB3C3D09A2DA34D16E2B1FE0D0 /* StrokeSettings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StrokeSettings.swift; path = Sources/StrokeSettings.swift; sourceTree = ""; }; - 443EE7198C2632F03154ABFAE32ED614 /* TouchDraw.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = TouchDraw.modulemap; sourceTree = ""; }; - 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS10.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 75F904ADA40E5F5391D0BD9BCAF4866D /* Pods-TouchDrawDemo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-TouchDrawDemo-umbrella.h"; sourceTree = ""; }; + 1B90DD716E2C6FC5BA5475042927EDD2 /* Pods-TouchDrawDemo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-TouchDrawDemo.modulemap"; sourceTree = ""; }; + 1CF060493070FAC4B5749C740B90244F /* TouchDraw.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = TouchDraw.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 1CF7E4ABD9284152023AE9181F9559A4 /* TouchDraw-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TouchDraw-umbrella.h"; sourceTree = ""; }; + 1D0B72476F05A0CC38FC4DBF106CBBAA /* Pods-TouchDrawDemo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-TouchDrawDemo-acknowledgements.plist"; sourceTree = ""; }; + 471D241AC2AE2D47DEF589BFBF6255BE /* StrokeSettings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StrokeSettings.swift; path = Sources/StrokeSettings.swift; sourceTree = ""; }; + 54EB6CB1AC201CFB3D6322E3C95BFE83 /* Pods-TouchDrawDemo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-TouchDrawDemo-acknowledgements.markdown"; sourceTree = ""; }; + 5757E5834DC91823EF2209EC5711BFE1 /* Stroke.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stroke.swift; path = Sources/Stroke.swift; sourceTree = ""; }; + 5A16F4CFC63FAC439D7A04994F579A03 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.3.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; + 690B6B972AA4BA0628F0108A4BA5C185 /* Pods-TouchDrawDemo-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-TouchDrawDemo-umbrella.h"; sourceTree = ""; }; + 7952030671E6CB4890FE0FD7D4708782 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + 85E9A9E5982B228807D55DE3C6184FE3 /* Pods-TouchDrawDemo-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-TouchDrawDemo-resources.sh"; sourceTree = ""; }; 86C1D0F22E480D6EC9D9EB69C3F344BF /* Pods_TouchDrawDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_TouchDrawDemo.framework; path = "Pods-TouchDrawDemo.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DFD433397FEB7BBB36D11772D8E766A /* Pods-TouchDrawDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-TouchDrawDemo.release.xcconfig"; sourceTree = ""; }; 9049C6C4D412D05000D515734CCA53B5 /* TouchDraw.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = TouchDraw.framework; path = TouchDraw.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 905F4C175DC4B6DCE59B564EED8B1B5A /* TouchDraw-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TouchDraw-umbrella.h"; sourceTree = ""; }; - 913319EAF156B4118678EB4EB80A0D97 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9294750FCE1D5B24F5D8A63B5A5BAB77 /* TouchDraw-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TouchDraw-prefix.pch"; sourceTree = ""; }; 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 95238DCEB25DB03C47680024DFDF8F10 /* Pods-TouchDrawDemo-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-TouchDrawDemo-acknowledgements.markdown"; sourceTree = ""; }; - A40FD835EDECB45DEB07D8164A56FE82 /* Pods-TouchDrawDemo-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-TouchDrawDemo-acknowledgements.plist"; sourceTree = ""; }; - AB8967C7ACE218DC0B8D555B514A561B /* Stroke.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Stroke.swift; path = Sources/Stroke.swift; sourceTree = ""; }; - AD683FAA74F4754D02F3BBF65658DA87 /* TouchDraw.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = TouchDraw.xcconfig; sourceTree = ""; }; - B39E7FDDF937BC7F073B03DF6983C230 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - B762EBF995F1D388B19EE84ED214925C /* Pods-TouchDrawDemo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-TouchDrawDemo-frameworks.sh"; sourceTree = ""; }; - CBC988718E777FB697734C63A39A91A8 /* Pods-TouchDrawDemo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-TouchDrawDemo-dummy.m"; sourceTree = ""; }; - CC3D3FC1902FBE131DF7E088A6231F9F /* Pods-TouchDrawDemo-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-TouchDrawDemo-resources.sh"; sourceTree = ""; }; - D6E342EB953AE1AEEEDB48116DA7C7DC /* TouchDraw-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "TouchDraw-dummy.m"; sourceTree = ""; }; - DDD7B3A7D582356DD34AC4424425907E /* TouchDrawView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TouchDrawView.swift; path = Sources/TouchDrawView.swift; sourceTree = ""; }; - EA428C349132345A57A1E6100C880A68 /* Pods-TouchDrawDemo.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; path = "Pods-TouchDrawDemo.modulemap"; sourceTree = ""; }; + A17E9596518A98B6F36BDAFC98CF58ED /* Pods-TouchDrawDemo-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-TouchDrawDemo-frameworks.sh"; sourceTree = ""; }; + B03A35E56F64A79658C671621D48E157 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B7A20CC8A469F8EA1D07FA29D719483C /* Pods-TouchDrawDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-TouchDrawDemo.debug.xcconfig"; sourceTree = ""; }; + D9D008CEC81CF49BD4ED7EC10CF15C4B /* TouchDraw-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "TouchDraw-prefix.pch"; sourceTree = ""; }; + E16EA0D1D61AB16D47CA211256EAFBE0 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E2FD25BF3696680CF183BDA514962A4E /* TouchDrawView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = TouchDrawView.swift; path = Sources/TouchDrawView.swift; sourceTree = ""; }; + E6532C1CC6EA56806D582433FED4F597 /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + ED012F5343741B588913D37ADA0F208A /* Pods-TouchDrawDemo-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-TouchDrawDemo-dummy.m"; sourceTree = ""; }; + EEAC8C2DC0377C3D9D1954EFD00FEE54 /* TouchDraw.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = TouchDraw.xcconfig; sourceTree = ""; }; + FAD03DDE9F824CCE3F63561D29275EDC /* TouchDraw.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = TouchDraw.modulemap; sourceTree = ""; }; + FC5B11770B0463A6F855BE9BC66C0BE6 /* TouchDraw-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "TouchDraw-dummy.m"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -59,7 +62,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F3A17B478CA3B615EF5586F55403BC94 /* Foundation.framework in Frameworks */, + 14040A60A6D97C332289898D036FB0F4 /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -67,18 +70,44 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0CD64BAC06FAFB571E7DE46E7F00885B /* Foundation.framework in Frameworks */, + 710137ADBBBF8A48C808244FC62D297F /* Foundation.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 1A61429307C062363CC987B76042F3AA /* Pods-TouchDrawDemo */ = { + isa = PBXGroup; + children = ( + E16EA0D1D61AB16D47CA211256EAFBE0 /* Info.plist */, + 1B90DD716E2C6FC5BA5475042927EDD2 /* Pods-TouchDrawDemo.modulemap */, + 54EB6CB1AC201CFB3D6322E3C95BFE83 /* Pods-TouchDrawDemo-acknowledgements.markdown */, + 1D0B72476F05A0CC38FC4DBF106CBBAA /* Pods-TouchDrawDemo-acknowledgements.plist */, + ED012F5343741B588913D37ADA0F208A /* Pods-TouchDrawDemo-dummy.m */, + A17E9596518A98B6F36BDAFC98CF58ED /* Pods-TouchDrawDemo-frameworks.sh */, + 85E9A9E5982B228807D55DE3C6184FE3 /* Pods-TouchDrawDemo-resources.sh */, + 690B6B972AA4BA0628F0108A4BA5C185 /* Pods-TouchDrawDemo-umbrella.h */, + B7A20CC8A469F8EA1D07FA29D719483C /* Pods-TouchDrawDemo.debug.xcconfig */, + 8DFD433397FEB7BBB36D11772D8E766A /* Pods-TouchDrawDemo.release.xcconfig */, + ); + name = "Pods-TouchDrawDemo"; + path = "Target Support Files/Pods-TouchDrawDemo"; + sourceTree = ""; + }; + 5E0D919E635D23B70123790B8308F8EF /* iOS */ = { + isa = PBXGroup; + children = ( + 5A16F4CFC63FAC439D7A04994F579A03 /* Foundation.framework */, + ); + name = iOS; + sourceTree = ""; + }; 7DB346D0F39D3F0E887471402A8071AB = { isa = PBXGroup; children = ( 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */, - 9C55A9B41C76F126DA825C3D313E4E06 /* Development Pods */, + C0544D9056987953E1D028DB42DB96D2 /* Development Pods */, BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */, DDD76B1D8DA4F9149B42CF7ECFCCF7A9 /* Products */, 8725E2AC80B50C13A64469D2A341B690 /* Targets Support Files */, @@ -88,59 +117,62 @@ 8725E2AC80B50C13A64469D2A341B690 /* Targets Support Files */ = { isa = PBXGroup; children = ( - FDC96AEB3466A0082046603C9D72D865 /* Pods-TouchDrawDemo */, + 1A61429307C062363CC987B76042F3AA /* Pods-TouchDrawDemo */, ); name = "Targets Support Files"; sourceTree = ""; }; - 9C55A9B41C76F126DA825C3D313E4E06 /* Development Pods */ = { + BA6BE01DF0254F9BEAA01F3F68DBC6BD /* TouchDraw */ = { isa = PBXGroup; children = ( - D3DD0292978334C69F8A9ACB2BE364F5 /* TouchDraw */, + 5757E5834DC91823EF2209EC5711BFE1 /* Stroke.swift */, + 471D241AC2AE2D47DEF589BFBF6255BE /* StrokeSettings.swift */, + E2FD25BF3696680CF183BDA514962A4E /* TouchDrawView.swift */, + C876898B85B969C5312AA492FAC82681 /* Pod */, + D364163B230110BB2E11ED4D418CDFA1 /* Support Files */, ); - name = "Development Pods"; + name = TouchDraw; + path = ../..; sourceTree = ""; }; - BC035B87ABF5456D72B8BECCAD71616B /* Support Files */ = { + BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */ = { isa = PBXGroup; children = ( - 913319EAF156B4118678EB4EB80A0D97 /* Info.plist */, - 443EE7198C2632F03154ABFAE32ED614 /* TouchDraw.modulemap */, - AD683FAA74F4754D02F3BBF65658DA87 /* TouchDraw.xcconfig */, - D6E342EB953AE1AEEEDB48116DA7C7DC /* TouchDraw-dummy.m */, - 9294750FCE1D5B24F5D8A63B5A5BAB77 /* TouchDraw-prefix.pch */, - 905F4C175DC4B6DCE59B564EED8B1B5A /* TouchDraw-umbrella.h */, + 5E0D919E635D23B70123790B8308F8EF /* iOS */, ); - name = "Support Files"; - path = "Demo/Pods/Target Support Files/TouchDraw"; + name = Frameworks; sourceTree = ""; }; - BC3CA7F9E30CC8F7E2DD044DD34432FC /* Frameworks */ = { + C0544D9056987953E1D028DB42DB96D2 /* Development Pods */ = { isa = PBXGroup; children = ( - D35AF013A5F0BAD4F32504907A52519E /* iOS */, + BA6BE01DF0254F9BEAA01F3F68DBC6BD /* TouchDraw */, ); - name = Frameworks; + name = "Development Pods"; sourceTree = ""; }; - D35AF013A5F0BAD4F32504907A52519E /* iOS */ = { + C876898B85B969C5312AA492FAC82681 /* Pod */ = { isa = PBXGroup; children = ( - 6604A7D69453B4569E4E4827FB9155A9 /* Foundation.framework */, + 7952030671E6CB4890FE0FD7D4708782 /* LICENSE */, + E6532C1CC6EA56806D582433FED4F597 /* README.md */, + 1CF060493070FAC4B5749C740B90244F /* TouchDraw.podspec */, ); - name = iOS; + name = Pod; sourceTree = ""; }; - D3DD0292978334C69F8A9ACB2BE364F5 /* TouchDraw */ = { + D364163B230110BB2E11ED4D418CDFA1 /* Support Files */ = { isa = PBXGroup; children = ( - AB8967C7ACE218DC0B8D555B514A561B /* Stroke.swift */, - 2F2BFECB3C3D09A2DA34D16E2B1FE0D0 /* StrokeSettings.swift */, - DDD7B3A7D582356DD34AC4424425907E /* TouchDrawView.swift */, - BC035B87ABF5456D72B8BECCAD71616B /* Support Files */, + B03A35E56F64A79658C671621D48E157 /* Info.plist */, + FAD03DDE9F824CCE3F63561D29275EDC /* TouchDraw.modulemap */, + EEAC8C2DC0377C3D9D1954EFD00FEE54 /* TouchDraw.xcconfig */, + FC5B11770B0463A6F855BE9BC66C0BE6 /* TouchDraw-dummy.m */, + D9D008CEC81CF49BD4ED7EC10CF15C4B /* TouchDraw-prefix.pch */, + 1CF7E4ABD9284152023AE9181F9559A4 /* TouchDraw-umbrella.h */, ); - name = TouchDraw; - path = ../..; + name = "Support Files"; + path = "Demo/Pods/Target Support Files/TouchDraw"; sourceTree = ""; }; DDD76B1D8DA4F9149B42CF7ECFCCF7A9 /* Products */ = { @@ -152,24 +184,6 @@ name = Products; sourceTree = ""; }; - FDC96AEB3466A0082046603C9D72D865 /* Pods-TouchDrawDemo */ = { - isa = PBXGroup; - children = ( - B39E7FDDF937BC7F073B03DF6983C230 /* Info.plist */, - EA428C349132345A57A1E6100C880A68 /* Pods-TouchDrawDemo.modulemap */, - 95238DCEB25DB03C47680024DFDF8F10 /* Pods-TouchDrawDemo-acknowledgements.markdown */, - A40FD835EDECB45DEB07D8164A56FE82 /* Pods-TouchDrawDemo-acknowledgements.plist */, - CBC988718E777FB697734C63A39A91A8 /* Pods-TouchDrawDemo-dummy.m */, - B762EBF995F1D388B19EE84ED214925C /* Pods-TouchDrawDemo-frameworks.sh */, - CC3D3FC1902FBE131DF7E088A6231F9F /* Pods-TouchDrawDemo-resources.sh */, - 75F904ADA40E5F5391D0BD9BCAF4866D /* Pods-TouchDrawDemo-umbrella.h */, - 2A5CB2191B4ED139378010C9C8A0FF49 /* Pods-TouchDrawDemo.debug.xcconfig */, - 09E9DFDA934DF7A7FA943F3812833E0D /* Pods-TouchDrawDemo.release.xcconfig */, - ); - name = "Pods-TouchDrawDemo"; - path = "Target Support Files/Pods-TouchDrawDemo"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -233,8 +247,8 @@ D41D8CD98F00B204E9800998ECF8427E /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0700; + LastSwiftUpdateCheck = 0930; + LastUpgradeCheck = 0930; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -286,68 +300,26 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 170D7EFA068C06664EADF01FE10DAD54 /* Debug */ = { + 26F1E8EB877E8DBEC15797D9156B1CC4 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2A5CB2191B4ED139378010C9C8A0FF49 /* Pods-TouchDrawDemo.debug.xcconfig */; + baseConfigurationReference = EEAC8C2DC0377C3D9D1954EFD00FEE54 /* TouchDraw.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; 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; - GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "Target Support Files/Pods-TouchDrawDemo/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_TouchDrawDemo; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 5D61B0D47F6FCEE6B9E8EA98FECF2C1B /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = AD683FAA74F4754D02F3BBF65658DA87 /* TouchDraw.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - 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_PREFIX_HEADER = "Target Support Files/TouchDraw/TouchDraw-prefix.pch"; INFOPLIST_FILE = "Target Support Files/TouchDraw/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/TouchDraw/TouchDraw.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_MODULE_NAME = TouchDraw; PRODUCT_NAME = TouchDraw; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -355,185 +327,243 @@ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; - 659E5CE69C03426FFC72375C909379CA /* Debug */ = { + 688403BFA3609BBA41CFFF78A23A8727 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AD683FAA74F4754D02F3BBF65658DA87 /* TouchDraw.xcconfig */; + baseConfigurationReference = B7A20CC8A469F8EA1D07FA29D719483C /* Pods-TouchDrawDemo.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; 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; - GCC_NO_COMMON_BLOCKS = YES; - GCC_PREFIX_HEADER = "Target Support Files/TouchDraw/TouchDraw-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/TouchDraw/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/TouchDraw/TouchDraw.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = TouchDraw; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 77743FE0682A633E95DE80DD6E1BF32E /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 09E9DFDA934DF7A7FA943F3812833E0D /* Pods-TouchDrawDemo.release.xcconfig */; - buildSettings = { - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - 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; INFOPLIST_FILE = "Target Support Files/Pods-TouchDrawDemo/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MODULEMAP_FILE = "Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = Pods_TouchDrawDemo; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - AD437F2BFE4533E225F1C5E01F86CD7D /* Release */ = { + 85CB0722012504192AEDFF2AC824F695 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_ALLOWED = NO; CODE_SIGNING_REQUIRED = NO; - COPY_PHASE_STRIP = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_RELEASE=1", "$(inherited)", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.1; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = "${SRCROOT}/../build"; + }; + name = Release; + }; + B5E1F9E9C97F621392EEA35F0C664198 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8DFD433397FEB7BBB36D11772D8E766A /* Pods-TouchDrawDemo.release.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "Target Support Files/Pods-TouchDrawDemo/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; }; name = Release; }; - BE978A9AE3D31F9ED006C2126C15BE2D /* Debug */ = { + B7E209B13D30439ACA24E5A807A68220 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGNING_ALLOWED = NO; CODE_SIGNING_REQUIRED = NO; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "POD_CONFIGURATION_DEBUG=1", "DEBUG=1", "$(inherited)", ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 8.1; + MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; + PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SYMROOT = "${SRCROOT}/../build"; }; name = Debug; }; + BD8BBAB7931DA090DBCAEFD328DB9DF7 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = EEAC8C2DC0377C3D9D1954EFD00FEE54 /* TouchDraw.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/TouchDraw/TouchDraw-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/TouchDraw/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/TouchDraw/TouchDraw.modulemap"; + PRODUCT_MODULE_NAME = TouchDraw; + PRODUCT_NAME = TouchDraw; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - BE978A9AE3D31F9ED006C2126C15BE2D /* Debug */, - AD437F2BFE4533E225F1C5E01F86CD7D /* Release */, + B7E209B13D30439ACA24E5A807A68220 /* Debug */, + 85CB0722012504192AEDFF2AC824F695 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -541,8 +571,8 @@ ACCBC9F6DD72BEFE4561BCAA45F02BEE /* Build configuration list for PBXNativeTarget "Pods-TouchDrawDemo" */ = { isa = XCConfigurationList; buildConfigurations = ( - 170D7EFA068C06664EADF01FE10DAD54 /* Debug */, - 77743FE0682A633E95DE80DD6E1BF32E /* Release */, + 688403BFA3609BBA41CFFF78A23A8727 /* Debug */, + B5E1F9E9C97F621392EEA35F0C664198 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -550,8 +580,8 @@ B49A96FAF06DD89BDF11D087A7A9C41B /* Build configuration list for PBXNativeTarget "TouchDraw" */ = { isa = XCConfigurationList; buildConfigurations = ( - 659E5CE69C03426FFC72375C909379CA /* Debug */, - 5D61B0D47F6FCEE6B9E8EA98FECF2C1B /* Release */, + BD8BBAB7931DA090DBCAEFD328DB9DF7 /* Debug */, + 26F1E8EB877E8DBEC15797D9156B1CC4 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-frameworks.sh b/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-frameworks.sh index bf20f76..ff6dcba 100755 --- a/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-frameworks.sh +++ b/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-frameworks.sh @@ -1,15 +1,28 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then + # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy + # frameworks to, so exit 0 (signalling the script phase was successful). + exit 0 +fi echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" +COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +# Used as a return value for each invocation of `strip_invalid_archs` function. +STRIP_BINARY_RETVAL=0 + # This protects against multiple targets copying the same framework dependency at the same time. The solution # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") +# Copies and strips a vendored framework install_framework() { if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then @@ -58,21 +71,40 @@ install_framework() fi } -# Copies the dSYM of a vendored framework +# Copies and strips a vendored dSYM install_dsym() { local source="$1" if [ -r "$source" ]; then - echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\"" - rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}" + # Copy the dSYM into a the targets temp dir. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}" + + local basename + basename="$(basename -s .framework.dSYM "$source")" + binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}" + + # Strip invalid architectures so "fat" simulator / device frameworks work on device + if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then + strip_invalid_archs "$binary" + fi + + if [[ $STRIP_BINARY_RETVAL == 1 ]]; then + # Move the stripped file into its final destination. + echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\"" + rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}" + else + # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing. + touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM" + fi fi } # Signs a framework with the provided identity code_sign_if_enabled() { - if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then + if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'" if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then code_sign_cmd="$code_sign_cmd &" @@ -85,10 +117,18 @@ code_sign_if_enabled() { # Strip invalid architectures strip_invalid_archs() { binary="$1" - # Get architectures for current file - archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)" + # Get architectures for current target binary + binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)" + # Intersect them with the architectures we are building for + intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)" + # If there are no archs supported by this binary then warn the user + if [[ -z "$intersected_archs" ]]; then + echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)." + STRIP_BINARY_RETVAL=0 + return + fi stripped="" - for arch in $archs; do + for arch in $binary_archs; do if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place lipo -remove "$arch" -output "$binary" "$binary" || exit 1 @@ -98,6 +138,7 @@ strip_invalid_archs() { if [[ "$stripped" ]]; then echo "Stripped $binary of architectures:$stripped" fi + STRIP_BINARY_RETVAL=1 } diff --git a/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-resources.sh b/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-resources.sh index a7df440..345301f 100755 --- a/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-resources.sh +++ b/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-resources.sh @@ -1,5 +1,13 @@ #!/bin/sh set -e +set -u +set -o pipefail + +if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then + # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy + # resources to, so exit 0 (signalling the script phase was successful). + exit 0 +fi mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -12,7 +20,7 @@ XCASSET_FILES=() # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????") -case "${TARGETED_DEVICE_FAMILY}" in +case "${TARGETED_DEVICE_FAMILY:-}" in 1,2) TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" ;; @@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then fi rm -f "$RESOURCES_TO_COPY" -if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] +if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ] then # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) @@ -102,5 +110,9 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + else + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist" + fi fi diff --git a/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.debug.xcconfig b/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.debug.xcconfig index e49b17d..b8ae4e1 100644 --- a/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.debug.xcconfig +++ b/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.debug.xcconfig @@ -1,11 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/TouchDraw" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/TouchDraw" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/TouchDraw/TouchDraw.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/TouchDraw/TouchDraw.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "TouchDraw" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.release.xcconfig b/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.release.xcconfig index e49b17d..b8ae4e1 100644 --- a/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.release.xcconfig +++ b/Demo/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo.release.xcconfig @@ -1,11 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES -FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/TouchDraw" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/TouchDraw" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/TouchDraw/TouchDraw.framework/Headers" +OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/TouchDraw/TouchDraw.framework/Headers" OTHER_LDFLAGS = $(inherited) -framework "TouchDraw" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. PODS_ROOT = ${SRCROOT}/Pods diff --git a/Demo/Pods/Target Support Files/TouchDraw/Info.plist b/Demo/Pods/Target Support Files/TouchDraw/Info.plist index 92aaf05..9a86452 100644 --- a/Demo/Pods/Target Support Files/TouchDraw/Info.plist +++ b/Demo/Pods/Target Support Files/TouchDraw/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.1.1 + 2.1.2 CFBundleSignature ???? CFBundleVersion diff --git a/Demo/Pods/Target Support Files/TouchDraw/TouchDraw.xcconfig b/Demo/Pods/Target Support Files/TouchDraw/TouchDraw.xcconfig index 3b69395..1905999 100644 --- a/Demo/Pods/Target Support Files/TouchDraw/TouchDraw.xcconfig +++ b/Demo/Pods/Target Support Files/TouchDraw/TouchDraw.xcconfig @@ -1,9 +1,8 @@ -CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/TouchDraw +CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/TouchDraw GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" -PODS_BUILD_DIR = $BUILD_DIR -PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_BUILD_DIR = ${BUILD_DIR} +PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../.. PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} diff --git a/Demo/TouchDrawDemo.xcodeproj/project.pbxproj b/Demo/TouchDrawDemo.xcodeproj/project.pbxproj index 62b1aee..04d7fd4 100644 --- a/Demo/TouchDrawDemo.xcodeproj/project.pbxproj +++ b/Demo/TouchDrawDemo.xcodeproj/project.pbxproj @@ -118,7 +118,6 @@ EE43D46A1A14A6F200311C06 /* Frameworks */, EE43D46B1A14A6F200311C06 /* Resources */, 92727888AFAFBE90DB06A190 /* [CP] Embed Pods Frameworks */, - E02A90476D5F5748EAB40ACC /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -213,21 +212,6 @@ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E02A90476D5F5748EAB40ACC /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TouchDrawDemo/Pods-TouchDrawDemo-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/Demo/TouchDrawDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/TouchDrawDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Demo/TouchDrawDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/TouchDraw.podspec b/TouchDraw.podspec index c1ea33a..beee930 100644 --- a/TouchDraw.podspec +++ b/TouchDraw.podspec @@ -11,7 +11,7 @@ Pod::Spec.new do |s| s.name = "TouchDraw" - s.version = "2.1.1" + s.version = "2.1.2" s.summary = "TouchDraw is a UIView you can draw on." s.description = <<-DESC diff --git a/TouchDraw/Info.plist b/TouchDraw/Info.plist index 449c7b6..3c29136 100644 --- a/TouchDraw/Info.plist +++ b/TouchDraw/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.1.1 + 2.1.2 CFBundleSignature ???? CFBundleVersion