Merge branch 'release/4.0' into color-assets

wedkarz · Jun 10, 2017 · f21cdd7 · f21cdd7
2 parents 85f6a51 + 9533a97
commit f21cdd7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,8 @@
+## 4.0.0.alpha.1
+
+- Deprecate clr based color resources
+- Introduce color asset based color resources
+
 ## 3.3.0
 
 *New features:*

diff --git a/R.swift.podspec b/R.swift.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
 
   spec.name         = "R.swift"
-  spec.version      = "3.3.0"
+  spec.version      = "4.0.0.alpha.1"
   spec.license      = "MIT"
 
   spec.summary      = "Get strong typed, autocompleted resources like images, fonts and segues in Swift projects"
@@ -26,7 +26,7 @@ Pod::Spec.new do |spec|
   spec.ios.deployment_target     = '8.0'
   spec.tvos.deployment_target    = '9.0'
 
-  spec.dependency "R.swift.Library", "~> 3.0.2"
+  spec.dependency "R.swift.Library", "~> 4.0.0.alpha.1"
 
   spec.preserve_paths = "rswift"
 

diff --git a/Sources/RswiftCore/ResourceTypes/Font.swift b/Sources/RswiftCore/ResourceTypes/Font.swift
@@ -24,8 +24,7 @@ struct Font: WhiteListedExtensionsResourceType {
       throw ResourceParsingError.parsingFailed("Unable to create data provider for font at \(url)")
     }
 
-    let font: CGFont? = CGFont(dataProvider)
-
+    let font = CGFont(dataProvider)
     guard let postScriptName = font?.postScriptName else {
       throw ResourceParsingError.parsingFailed("No postscriptName associated to font at \(url)")
     }

diff --git a/Sources/rswift/Rswift.swift b/Sources/rswift/Rswift.swift
@@ -10,6 +10,6 @@
 import Foundation
 
 struct Rswift {
-  static let version = "3.3.0"
+  static let version = "4.0.0.alpha.1"
   static let resourceFileName = "R.generated.swift"
 }