Merge branch 'release/1.0.2'

chrs1885 · Feb 26, 2020 · 77c680d · 77c680d
2 parents ca29833 + 83aa6be
commit 77c680d
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Version 1.0.2
+### Enhancements
+*[Support Swift Package Manager](https://github.com/chrs1885/SheetyColors/issues/10)
+
 ## 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

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,9 +1,9 @@
 PODS:
-  - Capable/Colors (1.0.1)
+  - Capable/Colors (1.1.3)
   - Nimble (8.0.2)
   - Quick (2.1.0)
-  - SheetyColors (1.0.0):
-    - Capable/Colors (~> 1.0.0)
+  - SheetyColors (1.0.2):
+    - Capable/Colors (~> 1.1)
   - SnapshotTesting (1.5.0)
 
 DEPENDENCIES:
@@ -13,7 +13,7 @@ DEPENDENCIES:
   - SnapshotTesting (= 1.5.0)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - Capable
     - Nimble
     - Quick
@@ -24,12 +24,12 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Capable: f102b9cb3167470fac31d07d175b95ecb4f9ca9a
+  Capable: 1568ec5d4dde7daf0925ea327463ee333c9f7341
   Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
   Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
-  SheetyColors: dbf4b6b427d10f0316a2237b8a00cd8d576466dd
+  SheetyColors: 1d0d56e5ee7923b3f12eea59a2815eae826479ee
   SnapshotTesting: 9ca1d80f6322509a035856170c11d0571b1f7171
 
 PODFILE CHECKSUM: 4d25efd32952718fd1b46a2d61df3cf0534d24cf
 
-COCOAPODS: 1.7.5
+COCOAPODS: 1.8.4
diff --git a/Package.swift b/Package.swift
@@ -3,14 +3,32 @@ import PackageDescription
 
 let package = Package(
     name: "SheetyColors",
+    platforms: [
+        .iOS(.v11),
+    ],
+    products: [
+        .library(
+            name: "SheetyColors",
+            targets: ["SheetyColors"]
+        )
+    ],
     dependencies: [
-        .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.40.11"),
-        .package(url: "https://github.com/Realm/SwiftLint", from: "0.34.0"),
+        .package(url: "https://github.com/chrs1885/Capable.git", from: "1.1.3"),
+        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.5.0"),
+        .package(url: "https://github.com/Quick/Quick.git", from: "2.1.0"),
+        .package(url: "https://github.com/Quick/Nimble.git", from: "8.0.4"),
+        .package(url: "https://github.com/nicklockwood/SwiftFormat", from: "0.40.13"),
+        .package(url: "https://github.com/Realm/SwiftLint", from: "0.35.0"),
         .package(url: "https://github.com/orta/Komondor", from: "1.0.4"),
         .package(url: "https://github.com/eneko/SourceDocs.git", from: "0.5.1"),
     ],
     targets: [
         .target(name: "SheetyColors_Example", dependencies: [], path: "Example", sources: ["SheetyColors/SheetType.swift"]),
+        .target(name: "SheetyColors", dependencies: ["Capable"], path: "SheetyColors"),
+        .testTarget(name: "SheetyColors_Tests", dependencies: ["SheetyColors", "Quick", "Nimble", "SnapshotTesting"], path: "Example/Tests"),
+    ],
+    swiftLanguageVersions: [
+        .v5,
     ]
 )
 

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ To run the example project from Xcode, clone the repo, and run `pod install` fro
 
 ## Installation
 
-There are currently three different ways to integrate **SheetyColors** into your apps.
+There are currently four different ways to integrate **SheetyColors** into your apps.
 
 ### CocoaPods
 
@@ -43,6 +43,14 @@ target 'MyApp' do
 end
 ```
 
+### Swift Package Manager
+
+```ruby
+dependencies: [
+    .package(url: "https://github.com/chrs1885/SheetyColors.git", from: "1.0.2")
+]
+```
+
 ### Carthage
 
 ```ruby

diff --git a/SheetyColors.podspec b/SheetyColors.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'SheetyColors'
-  s.version          = '1.0.1'
+  s.version          = '1.0.2'
   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'
+  s.dependency 'Capable/Colors', '~> 1.1'
 
   s.source_files     = 'SheetyColors/Classes/**/*.{swift}'
   s.resources        = 'SheetyColors/Classes/**/*.{xcassets,xib}'

diff --git a/SheetyColors/Classes/Common/Models/Extensions/CGFloat+constrainToRange.swift b/SheetyColors/Classes/Common/Models/Extensions/CGFloat+constrainToRange.swift
@@ -5,7 +5,7 @@
 //  Created by Christoph Wendt on 25.04.19.
 //
 
-import Foundation
+import CoreGraphics
 
 extension CGFloat {
     mutating func constrainTo(min: CGFloat = 0.0, max: CGFloat) {

diff --git a/SheetyColors/Classes/Common/ViewModels/SheetyColorsViewModelProtocol.swift b/SheetyColors/Classes/Common/ViewModels/SheetyColorsViewModelProtocol.swift
@@ -5,6 +5,8 @@
 //  Created by Christoph Wendt on 08.02.19.
 //
 
+import CoreGraphics
+
 protocol SheetyColorsViewModelProtocol {
     var viewModelDelegate: SheetyColorsViewModelDelegate? { get set }
     var hasTextOrMessage: Bool { get }

diff --git a/SheetyColors/Classes/Grayscale/Models/GrayscaleColor.swift b/SheetyColors/Classes/Grayscale/Models/GrayscaleColor.swift
@@ -5,7 +5,7 @@
 //  Created by Christoph Wendt on 25.04.19.
 //
 
-import CoreGraphics
+import UIKit
 
 /// A model class representing grayscale colors. The white component can hold values between 0.0 and 255.0 while the alphavalue has a maximum value of 100.0.
 public class GrayscaleColor: NSObject, NSCopying, Codable {

diff --git a/SheetyColors/Classes/Grayscale/ViewModels/GrayscaleViewModel.swift b/SheetyColors/Classes/Grayscale/ViewModels/GrayscaleViewModel.swift
@@ -5,6 +5,8 @@
 //  Created by Christoph Wendt on 25.04.19.
 //
 
+import CoreGraphics
+
 private enum SliderType: Int, CaseIterable {
     case white, alpha
 }

diff --git a/SheetyColors/Classes/HSB/Models/HSBAColor.swift b/SheetyColors/Classes/HSB/Models/HSBAColor.swift
@@ -5,7 +5,7 @@
 //  Created by Christoph Wendt on 20.04.19.
 //
 
-import CoreGraphics
+import UIKit
 
 /// A model class representing HSBA colors. The hue component can hold values between 0.0 and 360.0 while the saturation and brightnes values have a maximum value of 100.0.
 public class HSBAColor: NSObject, NSCopying, Codable {

diff --git a/SheetyColors/Classes/HSB/ViewModels/HSBViewModel.swift b/SheetyColors/Classes/HSB/ViewModels/HSBViewModel.swift
@@ -5,6 +5,8 @@
 //  Created by Christoph Wendt on 20.04.19.
 //
 
+import CoreGraphics
+
 private enum SliderType: Int, CaseIterable {
     case hue, saturation, brightness, alpha
 }

diff --git a/SheetyColors/Classes/RGB/Models/RGBAColor.swift b/SheetyColors/Classes/RGB/Models/RGBAColor.swift
@@ -5,7 +5,7 @@
 //  Created by Christoph Wendt on 10.02.19.
 //
 
-import CoreGraphics
+import UIKit
 
 /// A model class representing RGBA colors. The red, green, and blue component can hold values between 0.0 and 255.0 while the alpha value has a maximum value of 100.0.
 public class RGBAColor: NSObject, NSCopying, Codable {

diff --git a/SheetyColors/Classes/RGB/ViewModels/RGBViewModel.swift b/SheetyColors/Classes/RGB/ViewModels/RGBViewModel.swift
@@ -5,6 +5,8 @@
 //  Created by Christoph Wendt on 03.02.19.
 //
 
+import CoreGraphics
+
 private enum SliderType: Int, CaseIterable {
     case red, green, blue, alpha
 }