Merge pull request #3 from rapidfireworks/master

Fix entireString method for unicode characters

Author: svdo

.jazzy.yaml

@@ -5,6 +5,6 @@ author_url: https://github.com/svdo
 github_url: https://github.com/svdo/swift-RichText
 github_file_prefix: https://github.com/svdo/swift-RichText/tree/master
 module: RichString
-module_version: 2.2.0
+module_version: 2.2.1
 readme: README.md
 copyright: Copyright © 2016 [Stefan van den Oord](https://github.com/svdo). All rights reserved

.travis.yml

@@ -1,6 +1,6 @@
 sudo: false
 language: swift
-osx_image: xcode10.1
+osx_image: xcode11.6
 cache:
   - bundler
   - cocoapods
@@ -16,19 +16,19 @@ matrix:
       env:
         - SCHEME="RichString iOS"
         - SDK=iphonesimulator
-        - DESTINATION="platform=iOS Simulator,name=iPhone 6,OS=12.1"
+        - DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=13.6"
         - ACTION=test
     - os: osx
       env:
         - SCHEME="RichString watchOS"
         - SDK=watchsimulator
-        - DESTINATION="platform=watchOS Simulator,name=Apple Watch Series 3 - 42mm,OS=5.1"
+        - DESTINATION="platform=watchOS Simulator,name=Apple Watch Series 5 - 44mm,OS=6.2.1"
         - ACTION=build
     - os: osx
       env:
         - SCHEME="RichString tvOS"
         - SDK="appletvsimulator"
-        - DESTINATION="platform=tvOS Simulator,name=Apple TV 4K (at 1080p),OS=12.1"
+        - DESTINATION="platform=tvOS Simulator,name=Apple TV 4K (at 1080p),OS=13.4"
         - ACTION=build
 script:
   - xcodebuild -workspace RichString.xcworkspace -scheme "${SCHEME}" -showdestinations

CHANGELOG CHANGELOG.md

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

Demo tvOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>NSExtension</key>

Demo watchOS Extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>UISupportedInterfaceOrientations</key>

Demo watchOS/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

Demo_iOS/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>

Demo_macOS/Info.plist

@@ -3,5 +3,5 @@ source 'https://rubygems.org' do
     gem 'xcpretty'
 end
 
-gem 'jazzy', git: 'https://github.com/realm/jazzy.git'
+gem 'jazzy', '0.9.5'
 

Gemfile

@@ -1,28 +1,14 @@
-GIT
-  remote: https://github.com/realm/jazzy.git
-  revision: 11742ed318b7e6c80834e87b4c178784533d216c
-  specs:
-    jazzy (0.9.5)
-      cocoapods (~> 1.5.3)
-      mustache (~> 1.1.0)
-      open4
-      redcarpet (~> 3.4.0)
-      rouge (>= 2.0.6, < 4.0)
-      sass (~> 3.6.0)
-      sqlite3 (~> 1.3.13)
-      xcinvoke (~> 0.3.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
-    activesupport (4.2.11)
+    CFPropertyList (3.0.3)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     atomos (0.1.3)
-    claide (1.0.2)
+    claide (1.0.3)
     cocoapods (1.5.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
@@ -46,56 +32,65 @@ GEM
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.2)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.8)
     escape (0.0.4)
-    ffi (1.10.0)
+    ffi (1.15.0)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    jazzy (0.9.5)
+      cocoapods (~> 1.5.3)
+      mustache (~> 1.1.0)
+      open4
+      redcarpet (~> 3.4.0)
+      rouge (>= 2.0.6, < 4.0)
+      sass (~> 3.6.0)
+      sqlite3 (~> 1.3.13)
+      xcinvoke (~> 0.3.0)
     liferaft (0.0.6)
-    minitest (5.11.3)
+    minitest (5.14.4)
     molinillo (0.6.6)
-    mustache (1.1.0)
-    nanaimo (0.2.6)
+    mustache (1.1.1)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
     open4 (1.3.4)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.4.0)
     rouge (2.0.7)
-    ruby-macho (1.3.1)
+    ruby-macho (1.4.0)
     sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     sqlite3 (1.3.13)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.8.0)
+    xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
 
@@ -104,8 +99,8 @@ PLATFORMS
 
 DEPENDENCIES
   cocoapods!
-  jazzy!
+  jazzy (= 0.9.5)
   xcpretty!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

Gemfile.lock

@@ -1,32 +1,34 @@
-abstract_target 'RichString' do
-  use_frameworks!
 
-  target 'RichString iOS' do
+target 'RichString iOS' do
     platform :ios, '10.0'
-  end
-  target 'RichString macOS' do
-    platform :osx, '10.12'
-  end
-  target 'RichString watchOS' do
-    platform :watchos, '2.0'
-  end
-  target 'RichString tvOS' do
-    platform :tvos, '10.0'
-  end
-
-  abstract_target 'RichStringTests' do
-    pod 'Quick', '~> 1.2'
-    pod 'Nimble', '~> 7.0'
-
+    use_frameworks!
     target 'RichStringTests iOS' do
-      platform :ios, '10.0'
+        pod 'Quick', '~> 3.0', :inhibit_warnings => true
+        pod 'Nimble', '~> 9.0'
+        platform :ios, '10.0'
     end
+end
+
+target 'RichString macOS' do
+    platform :osx, '10.12'
     target 'RichStringTests macOS' do
-      platform :osx, '10.12'
+        pod 'Quick', '~> 3.0', :inhibit_warnings => true
+        pod 'Nimble', '~> 9.0'
+        platform :osx, '10.12'
     end
+end
+
+target 'RichString watchOS' do
+    platform :watchos, '2.0'
+end
+
+target 'RichString tvOS' do
+    platform :tvos, '10.0'
     target 'RichStringTests tvOS' do
-      platform :tvos, '10.0'
+        pod 'Quick', '~> 3.0', :inhibit_warnings => true
+        pod 'Nimble', '~> 9.0'
+        platform :tvos, '10.0'
     end
-  end
-
 end
+
+

Podfile

@@ -1,20 +1,20 @@
 PODS:
-  - Nimble (7.3.3)
-  - Quick (1.3.4)
+  - Nimble (9.0.1)
+  - Quick (3.1.2)
 
 DEPENDENCIES:
-  - Nimble (~> 7.0)
-  - Quick (~> 1.2)
+  - Nimble (~> 9.0)
+  - Quick (~> 3.0)
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - Nimble
     - Quick
 
 SPEC CHECKSUMS:
-  Nimble: 3b434b1e7d0a92603a13550a82880b0d952f518e
-  Quick: f4f7f063c524394c73ed93ac70983c609805d481
+  Nimble: 7bed62ffabd6dbfe05f5925cbc43722533248990
+  Quick: 60f0ea3b8e0cfc0df3259a5c06a238ad8b3c46e0
 
-PODFILE CHECKSUM: 5568b43325d4b1f2d46d6bb666642ffd80daf19f
+PODFILE CHECKSUM: a43b172582e8052fa488779b81eda1b4112a1523
 
-COCOAPODS: 1.6.0
+COCOAPODS: 1.10.1