Merge pull request #1 from codyrobb/swift-3.0

Swift 3.0
codyrobb · Jan 13, 2017 · cf7e5c4 · cf7e5c4
2 parents 5536fef + 8d64aad
commit cf7e5c4
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-2.3
+3.0
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,5 @@
+import PackageDescription
+
+let package = Package(
+    name: "Phrase"
+)
diff --git a/Phrase.podspec b/Phrase.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
   spec.name         = 'Phrase'
-  spec.version      = '1.0.0'
+  spec.version      = '2.0.0'
   spec.license      = { :type => 'Apache License, Version 2.0' }
   spec.homepage     = 'https://github.com/codyrobb/Phrase'
   spec.authors      = { 'Cody Robertson' => '[email protected]' }
   spec.summary      = 'A Swift templating library.'
-  spec.source       = { :git => 'https://github.com/codyrobb/Phrase.git', :tag => '1.0.0' }
+  spec.source       = { :git => 'https://github.com/codyrobb/Phrase.git', :tag => '2.0.0' }
   spec.source_files = 'Sources/*'
 
   spec.ios.deployment_target  = '9.0'

diff --git a/Sources/Phrase.swift b/Sources/Phrase.swift
@@ -56,7 +56,7 @@ final public class Phrase {
         var formatted = template
 
         for (key, value) in replacements {
-            formatted = formatted.stringByReplacingOccurrencesOfString(tokenize(key), withString: value)
+            formatted = formatted.replacingOccurrences(of: tokenize(key: key), with: value)
         }
 
         return formatted