Merge pull request #6 from lobodart/dev

Release 2.2.0
lobodart · May 24, 2018 · 95adfeb · 95adfeb
2 parents 7420202 + 3d209b3
commit 95adfeb
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.1
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: swift
 
-osx_image: xcode9
-xcode_sdk: iphonesimulator11.0
+osx_image: xcode9.3
+xcode_sdk: iphonesimulator11.3
 
 script: ./scripts/ci.sh
 
@@ -10,4 +10,4 @@ deploy:
   script: ./scripts/push.sh
   on:
     branch: master
-    tags: true
+    tags: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 2.2.0 (May 24, 2018)
+
+- Swift 4.1 Update
+- Removing minor warnings
+
+
+## 2.1.0 (October 25, 2017)
+
+- Swift 4.0 Update
+- Removing minor warnings
+
+
 ## 2.0.0 (September 19, 2016)
 
 - Swift 3 Update

diff --git a/CheatyXML.podspec b/CheatyXML.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "CheatyXML"
-  s.version      = "2.1.0"
+  s.version      = "2.2.0"
   s.summary      = "CheatyXML"
 
   s.description  = <<-DESC
@@ -66,7 +66,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  s.source       = { :git => "https://github.com/lobodart/CheatyXML.git", :tag => "v2.1.0" }
+  s.source       = { :git => "https://github.com/lobodart/CheatyXML.git", :tag => "v2.2.0" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #

diff --git a/CheatyXML/CXMLParser.swift b/CheatyXML/CXMLParser.swift
@@ -54,7 +54,7 @@ public class CXMLParser: NSObject, XMLParserDelegate {
 
     deinit {
         for pointer in self._allocatedPointersList {
-            pointer.deallocate(capacity: 1)
+            pointer.deallocate()
         }
     }
 
@@ -105,7 +105,7 @@ public class CXMLParser: NSObject, XMLParserDelegate {
         tmpString! += string
 
         let regex: NSRegularExpression = try! NSRegularExpression(pattern: "[^\\n\\s]+", options: [])
-        if regex.matches(in: tmpString, options: [], range: NSMakeRange(0, tmpString.characters.count)).count <= 0 {
+        if regex.matches(in: tmpString, options: [], range: NSMakeRange(0, tmpString.count)).count <= 0 {
             tmpString = nil
         }
 

diff --git a/CheatyXML/Info.plist b/CheatyXML/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>