Merge pull request #14 from wibosco/swift-5-conversion

Converted project to use swift 5

.gitignore

@@ -43,7 +43,7 @@ playground.xcworkspace
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-Pods/
+#Pods/
 
 # Carthage
 #

.travis.yml

@@ -3,7 +3,7 @@ language: objective-c
 cache:
   - bundler
 
-osx_image: xcode10.2
+osx_image: xcode11.3
 
 before_install:
    - bundle install

CHANGELOG.md

@@ -4,33 +4,39 @@ All notable changes to this project will be documented in this file.
 
 ---
 
-## [1.1.0](https://github.com/wibosco/TypeWritingLabel/releases/tag/1.0.0)
+## [2.0.0]((https://github.com/wibosco/GhostTypewriter/releases/tag/2.0.0)
 
-* Simplified `TypewriterLabel` API
+* Updated the project to use Swift 5.
+* Extended and rewrote `TypewriterLabel` API to allow for greater control of the animation.
+* Improved unit tests by making them more deterministic due to the introduction of a Timer factory.
 
-## [1.0.0](https://github.com/wibosco/TypeWritingLabel/releases/tag/1.0.0)
+## [1.1.0](https://github.com/wibosco/GhostTypewriter/releases/tag/1.1.0)
 
-* Updated project to use Swift 4.0
-* Added `fastlane` to make building the project on Travis-CI easier
+* Simplified `TypewriterLabel` API.
 
-## [0.5.1](https://github.com/wibosco/TypeWritingLabel/releases/tag/0.5.1)
+## [1.0.0](https://github.com/wibosco/GhostTypewriter/releases/tag/1.0.0)
 
-* Added missing documentation
-* Improved typing animation example gif
+* Updated project to use Swift 4.0.
+* Added `fastlane` to make building the project on Travis-CI easier.
 
-## [0.5.0](https://github.com/wibosco/TypeWritingLabel/releases/tag/0.5.0)
+## [0.5.1](https://github.com/wibosco/GhostTypewriter/releases/tag/0.5.1)
 
-* Apply pre-animation transparency option to label when added to superview
-* Unit tests
+* Added missing documentation.
+* Improved typing animation example gif.
 
-## [0.2.0](https://github.com/wibosco/TypeWritingLabel/releases/tag/0.2.0)
+## [0.5.0](https://github.com/wibosco/GhostTypewriter/releases/tag/0.5.0)
 
-* Supports unicode characters - treats multiple code points as one character
+* Apply pre-animation transparency option to label when added to superview.
+* Added unit tests.
 
-## [0.1.0](https://github.com/wibosco/TypeWritingLabel/releases/tag/0.1.0)
+## [0.2.0](https://github.com/wibosco/GhostTypewriter/releases/tag/0.2.0)
 
-* Renamed to `GhostTypeWriter`
+* Supports unicode characters - treats multiple code points as one character.
 
-## [0.0.1](https://github.com/wibosco/TypeWritingLabel/releases/tag/0.0.1)
+## [0.1.0](https://github.com/wibosco/GhostTypewriter/releases/tag/0.1.0)
 
-* Supports type writer effect animation using `NSAttributedString`
+* Renamed to `GhostTypeWriter`.
+
+## [0.0.1](https://github.com/wibosco/GhostTypewriter/releases/tag/0.0.1)
+
+* Supports type writer effect animation using `NSAttributedString`.

Example/.ruby-version

@@ -1 +1 @@
-2.1.10
+2.5.1

Example/Example.xcodeproj/project.pbxproj

@@ -199,23 +199,25 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 0940;
+				LastUpgradeCheck = 1120;
 				ORGANIZATIONNAME = Boles;
 				TargetAttributes = {
 					915B18EA1E0844E20038B5DD = {
 						CreatedOnToolsVersion = 8.1;
+						LastSwiftMigration = 1120;
 						ProvisioningStyle = Automatic;
 					};
 					915B18FE1E0844E20038B5DD = {
 						CreatedOnToolsVersion = 8.1;
+						LastSwiftMigration = 1120;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 915B18EA1E0844E20038B5DD;
 					};
 				};
 			};
 			buildConfigurationList = 915B18E61E0844E20038B5DD /* Build configuration list for PBXProject "Example" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -277,7 +279,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/GhostTypewriter/GhostTypewriter.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -286,7 +288,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -343,6 +345,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -401,6 +404,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -458,7 +462,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.boles.ghosttypewriter.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -472,7 +476,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.boles.ghosttypewriter.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -485,7 +489,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.boles.ghosttypewriter.exampletests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
 			};
 			name = Debug;
@@ -499,7 +503,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.boles.ghosttypewriter.exampletests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
 			};
 			name = Release;

Example/Example/Application/AppDelegate.swift

@@ -15,7 +15,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     // MARK: - AppLifecycle
 
-    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
     }