Swift 4.2 and quality of life improvements (#82)

Swift 4.2 and quality of life improvements Co-authored-by: Jack Yin <[email protected]> Co-authored-by: null <[email protected]> Co-authored-by: ming.z <[email protected]> Co-authored-by: Joel Fischer <[email protected]>
home-assistant · May 16, 2019 · a533a66 · a533a66
2 parents d7ab8ea + 662ba75
commit a533a66
Show file tree

Hide file tree

Showing 15 changed files with 220 additions and 324 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -7,6 +7,7 @@ disabled_rules:
     - type_body_length
     - trailing_whitespace
     - cyclomatic_complexity
+    - identifier_name
 
 included:
     - Samples

diff --git a/Iconic.podspec b/Iconic.podspec
@@ -1,39 +1,34 @@
-@version = '1.3'
+@version = '1.4'
 
 Pod::Spec.new do |s|
-  
+
   s.name            = 'Iconic'
   s.version         = @version
   s.summary         = 'Auto-generated icon font library for iOS [beta]'
   s.description     = 'Iconic will help you make icon fonts integration on iOS easy and effortless. Its main component is in charge of auto-generating strongly typed code in Swift, fully compatible with Objective-C, allowing the integration of vector icons as image or text in your apps.'
-  
+
   s.homepage        = 'https://github.com/dzenbot/Iconic'
   s.screenshots     = ''
   s.author          = { 'Ignacio Romero Zurbuchen' => '[email protected]' }
-  
+
   s.license = {
       :type => 'MIT',
       :file => 'LICENSE'
   }
-  
+
   s.source = {
       :git => 'https://github.com/dzenbot/Iconic.git',
       :tag => @version
   }
-  
+
   s.source_files    = 'Source/*.{swift}'
   s.resources       = 'Source/**/*.{ttf,otf}'
-  s.preserve_paths  = 'Source/Catalog/**/*.*'
+  s.preserve_paths  = 'Source/'
   s.framework       = 'UIKit', 'CoreText'
-  
+
   s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '9.0'
   s.watchos.deployment_target = '2.0'
 
-  s.pod_target_xcconfig = {
-      'ENABLE_BITCODE' => 'NO',
-      'SWIFT_VERSION' => '3.0',
-  }
-
-  s.prepare_command = "sh Source/Iconizer.sh '#{ENV['FONT_PATH']}' --verbose"
+  s.prepare_command = "sh Source/Iconizer.sh '#{ENV['FONT_PATH']}' '#{ENV['CUSTOM_FONT_NAME']}'"
 end
diff --git a/Samples/Podfile b/Samples/Podfile
@@ -33,11 +33,3 @@ target 'Tests' do
     pod 'FBSnapshotTestCase/Core'
     iconic
 end
-
-post_install do |installer|
-    installer.pods_project.targets.each do |target|
-        target.build_configurations.each do |config|
-            config.build_settings['SWIFT_VERSION'] = '3.0'
-        end
-    end
-end