Merge branch 'release/1.0.1'

chrs1885 · Oct 14, 2019 · ca29833 · ca29833
2 parents bb6342b + 36038e9
commit ca29833
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 274 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,7 +36,6 @@ Carthage/Build
 Pods/
 
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-# Package.resolved
+.swiftpm
+Package.resolved
 .build/
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Version 1.0.1
+### Bugfix
+* Fix version of Capable dependency which was causing issues in projects where Capable was used side by side with SheetyColors
+
 ## Version 1.0.0
 ### Enhancements
 * [Support iOS 13](https://github.com/chrs1885/SheetyColors/issues/3)

diff --git a/Colors.xcassets/Contents.json b/Colors.xcassets/Contents.json
diff --git a/Colors.xcassets/sliderThumbBorderColor.colorset/Contents.json b/Colors.xcassets/sliderThumbBorderColor.colorset/Contents.json
diff --git a/Colors.xcassets/sliderThumbShadowColor.colorset/Contents.json b/Colors.xcassets/sliderThumbShadowColor.colorset/Contents.json
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - Capable/Colors (1.0.1)
   - Nimble (8.0.2)
   - Quick (2.1.0)
-  - SheetyColors (0.3.1):
+  - SheetyColors (1.0.0):
     - Capable/Colors (~> 1.0.0)
   - SnapshotTesting (1.5.0)
 
@@ -27,9 +27,9 @@ SPEC CHECKSUMS:
   Capable: f102b9cb3167470fac31d07d175b95ecb4f9ca9a
   Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
   Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
-  SheetyColors: 9edd082cd40f6ab3681262ff73cf21349fe37853
+  SheetyColors: dbf4b6b427d10f0316a2237b8a00cd8d576466dd
   SnapshotTesting: 9ca1d80f6322509a035856170c11d0571b1f7171
 
 PODFILE CHECKSUM: 4d25efd32952718fd1b46a2d61df3cf0534d24cf
 
-COCOAPODS: 1.6.0.rc.2
+COCOAPODS: 1.7.5
diff --git a/Example/SheetyColors.xcodeproj/project.pbxproj b/Example/SheetyColors.xcodeproj/project.pbxproj
@@ -488,17 +488,13 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-SheetyColors_Tests/Pods-SheetyColors_Tests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework",
 				"${BUILT_PRODUCTS_DIR}/Quick/Quick.framework",
 				"${BUILT_PRODUCTS_DIR}/SnapshotTesting/SnapshotTesting.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework",
@@ -594,16 +590,12 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-SheetyColors_Example/Pods-SheetyColors_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Capable/Capable.framework",
 				"${BUILT_PRODUCTS_DIR}/SheetyColors/SheetyColors.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-			);
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Capable.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SheetyColors.framework",

diff --git a/Package.resolved b/Package.resolved
diff --git a/SheetyColors.podspec b/SheetyColors.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'SheetyColors'
-  s.version          = '1.0.0'
+  s.version          = '1.0.1'
   s.summary          = 'An action sheet styled color picker for iOS.'
 
   s.description      = <<-DESC
@@ -15,7 +15,7 @@ The SheetyColors color picker is based on UIKit's UIAlertController. Therefore,
   s.social_media_url = 'https://twitter.com/chr_wendt'
 
   s.ios.deployment_target = '11.0'
-  s.dependency 'Capable/Colors', '~> 1.0.0'
+  s.dependency 'Capable/Colors', '~> 1.0'
 
   s.source_files     = 'SheetyColors/Classes/**/*.{swift}'
   s.resources        = 'SheetyColors/Classes/**/*.{xcassets,xib}'