Merge pull request #9 from Pidji/master

migrated to swift 4.2
Multy-io · Oct 19, 2018 · 005b6e9 · 005b6e9
2 parents 9644bc2 + f16573a
commit 005b6e9
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/Example/.DS_Store b/Example/.DS_Store
diff --git a/Example/Hash2Pics.xcodeproj/project.pbxproj b/Example/Hash2Pics.xcodeproj/project.pbxproj
@@ -212,11 +212,11 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1000;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -475,8 +475,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -491,8 +490,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};
@@ -512,8 +510,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Debug;
 		};
@@ -529,8 +526,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 			};
 			name = Release;
 		};

diff --git a/Example/Hash2Pics.xcworkspace/xcuserdata/Core.xcuserdatad/UserInterfaceState.xcuserstate b/Example/Hash2Pics.xcworkspace/xcuserdata/Core.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Example/Hash2Pics/AppDelegate.swift b/Example/Hash2Pics/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Hash2Pics.podspec b/Hash2Pics.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Hash2Pics'
-  s.version          = '0.1.3'
+  s.version          = '0.1.4'
   s.summary          = 'Lib for creating crypto avatars.'
 
 # This description is used to generate tags and improve search results.
@@ -31,7 +31,7 @@ TODO: This is open-source lib for creating awesome avatars from any crypto addre
   s.ios.deployment_target = '8.0'
 
   s.source_files = 'Hash2Pics/Classes/**/*'
-  s.swift_version = '4.1'
+  s.swift_version = '4.2'
   # s.resource_bundles = {
   #   'Hash2Pics' => ['Hash2Pics/Assets/*.png']
   # }

diff --git a/Hash2Pics/Classes/PictureConstructor.swift b/Hash2Pics/Classes/PictureConstructor.swift
@@ -115,7 +115,7 @@ public class PictureConstructor: NSObject {
         let result = TextLayer()
         result.frame = CGRect(x: 0, y: 0, width: diameterInPixels, height: diameterInPixels)
         result.string = text
-        result.alignmentMode = kCAAlignmentCenter
+        result.alignmentMode = CATextLayerAlignmentMode.center
         let fontSize = 0.4 * diameterInPixels
         result.font = UIFont(name: "AvenirNext-Bold", size: fontSize)
         result.fontSize = fontSize

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 | Target | Version |
 | ------- | -------- |
 | iOS     | => 8.0  |
-|Swift    | => 4.1  |
+|Swift    | => 4.2  |
 
 ## Installation
 
@@ -37,7 +37,7 @@ To run the example project, clone the repo, and run `pod install` from the Examp
 
 ## Authors
 
-This library developed by guys from Multy - best open-source multy-blockchain wallet, team@multy.io
+This library developed by guys from Multy - best open-source multi-blockchain wallet, team@multy.io
 
 ## License