From 945ac478997b2a1830574fe0dd399c926ff18905 Mon Sep 17 00:00:00 2001 From: Cody Robertson Date: Fri, 13 Jan 2017 04:13:39 -0500 Subject: [PATCH 1/3] Update to Swift 3.0 --- Package.swift | 5 +++++ Sources/Phrase.swift | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 Package.swift mode change 100755 => 100644 Sources/Phrase.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..13917a8 --- /dev/null +++ b/Package.swift @@ -0,0 +1,5 @@ +import PackageDescription + +let package = Package( + name: "Phrase" +) diff --git a/Sources/Phrase.swift b/Sources/Phrase.swift old mode 100755 new mode 100644 index 5fdb10d..d73ca4b --- 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 From bbb8261dbbe686ba3fbc022afa37f8184a14c7b0 Mon Sep 17 00:00:00 2001 From: Cody Robertson Date: Fri, 13 Jan 2017 04:14:19 -0500 Subject: [PATCH 2/3] Update .swift-version --- .swift-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.swift-version b/.swift-version index bb576db..9f55b2c 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -2.3 +3.0 From 8d64aad4f386c89fd888508e74ae4ec38b2c1dab Mon Sep 17 00:00:00 2001 From: Cody Robertson Date: Fri, 13 Jan 2017 04:14:45 -0500 Subject: [PATCH 3/3] Update Phrase.podspec --- Phrase.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Phrase.podspec b/Phrase.podspec index 3ca190c..4561f21 100755 --- 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' => 'codyrobertsonn@gmail.com' } 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'