.swift-version

@@ -1 +1 @@
-4.0
+5.0

.travis.yml

@@ -1,12 +1,12 @@
-osx_image: xcode9.4
+osx_image: xcode10.2
 language: objective-c
 env:
   global:
     - PROJECT="Tagging.xcodeproj"
     - SCHEME="TaggingExample"
     - IOS_SDK="iphonesimulator"
   matrix:
-    - SDK="$IOS_SDK"  DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.4"
+    - SDK="$IOS_SDK"  DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.2"
 
 install:
   - swift --version

Example/AppDelegate.swift

@@ -1,19 +1,11 @@
-//
-//  AppDelegate.swift
-//  TaggingExample
-//
-//  Created by DongHeeKang on 2018. 7. 2..
-//  Copyright © 2018년 k-lpmg. All rights reserved.
-//
-
 import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         return true
     }
 

Example/Sources/TaggingViewController.swift

@@ -1,11 +1,3 @@
-//
-//  TaggingViewController.swift
-//  TaggingExample
-//
-//  Created by DongHeeKang on 2018. 6. 23..
-//  Copyright © 2018년 k-lpmg. All rights reserved.
-//
-
 import UIKit
 
 import Tagging
@@ -43,9 +35,9 @@ class TaggingViewController: UIViewController {
             tagging.cornerRadius = 20
             tagging.textInset = UIEdgeInsets(top: 16, left: 16, bottom: 16, right: 16)
             tagging.backgroundColor = UIColor.lightGray.withAlphaComponent(0.1)
-            tagging.defaultAttributes = [NSAttributedStringKey.foregroundColor: UIColor.black, NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 20)]
-            tagging.symbolAttributes = [NSAttributedStringKey.foregroundColor: UIColor.gray]
-            tagging.taggedAttributes = [NSAttributedStringKey.foregroundColor: UIColor.gray, NSAttributedStringKey.underlineStyle: NSNumber(value: 1)]
+            tagging.defaultAttributes = [NSAttributedString.Key.foregroundColor: UIColor.black, NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 20)]
+            tagging.symbolAttributes = [NSAttributedString.Key.foregroundColor: UIColor.gray]
+            tagging.taggedAttributes = [NSAttributedString.Key.foregroundColor: UIColor.gray, NSAttributedString.Key.underlineStyle: NSNumber(value: 1)]
             tagging.dataSource = self
 
             tagging.symbol = "#"

Sources/Info.plist → Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>0.5.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

README.md

@@ -1,18 +1,17 @@
 # Tagging
+[![Build Status](https://travis-ci.org/k-lpmg/Tagging.svg?branch=master)](https://travis-ci.org/k-lpmg/Tagging)
+![Swift](https://img.shields.io/badge/Swift-5.0-orange.svg)
 [![Cocoapods](https://img.shields.io/cocoapods/v/Tagging.svg?style=flat)](https://cocoapods.org/pods/Tagging)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-![Swift](https://img.shields.io/badge/Swift-4.1-orange.svg)
-[![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg?style=flat)](https://raw.githubusercontent.com/k-lpmg/RealmWrapper/master/LICENSE)
-[![Build Status](https://travis-ci.org/k-lpmg/Tagging.svg?branch=master)](https://travis-ci.org/k-lpmg/Tagging)
 
-✍️ TextView that provides easy to use tagging feature for Mention or Hashtag.
+A TextView that provides easy to use tagging feature for Mention or Hashtag.
 
 
 ## Introduction
 [Tagging](https://github.com/k-lpmg/Tagging) is a UIView that encloses a TextView that contains an algorithm for tagging.
 If you're worried about implementing `Mention` or `Hashtag` in your app, you can easily implement them using the library.
 
-![taggingtooverwatchhero](https://user-images.githubusercontent.com/15151687/42734216-23087396-887b-11e8-9ad9-16975de922c8.gif)
+![tagging](https://user-images.githubusercontent.com/15151687/43359597-9be98a16-92df-11e8-8bda-4719502bd907.gif)
 
 
 ## Getting Started
@@ -68,12 +67,12 @@ func tagging(_ tagging: Tagging, didChangedTaggedList taggedList: [TaggingModel]
 platform :ios, '8.0'
 use_frameworks!
 
-target 'MyApp' do
-pod 'Tagging'
+target '<Your Target Name>' do
+    pod 'Tagging'
 end
 ```
 
-### Carthage (iOS 8+)
+#### Carthage (iOS 8+)
 
 ```ruby
 github "k-lpmg/Tagging"

Sources/Tagging.swift → Sources/Tagging/Tagging.swift

@@ -1,11 +1,3 @@
-//
-//  Tagging.swift
-//  Tagging
-//
-//  Created by DongHeeKang on 2018. 6. 16..
-//  Copyright © 2018년 k-lpmg. All rights reserved.
-//
-
 import UIKit
 import Foundation
 
@@ -42,17 +34,17 @@ open class Tagging: UIView {
 
     open var symbol: String = "@"
     open var tagableList: [String]?
-    open var defaultAttributes: [NSAttributedStringKey: Any] = {
-        return [NSAttributedStringKey.foregroundColor: UIColor.black,
-                NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 15),
-                NSAttributedStringKey.underlineStyle: NSNumber(value: 0)]
+    open var defaultAttributes: [NSAttributedString.Key: Any] = {
+        return [NSAttributedString.Key.foregroundColor: UIColor.black,
+                NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 15),
+                NSAttributedString.Key.underlineStyle: NSNumber(value: 0)]
     }()
-    open var symbolAttributes: [NSAttributedStringKey: Any] = {
-        return [NSAttributedStringKey.foregroundColor: UIColor.black,
-                NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 15),
-                NSAttributedStringKey.underlineStyle: NSNumber(value: 0)]
+    open var symbolAttributes: [NSAttributedString.Key: Any] = {
+        return [NSAttributedString.Key.foregroundColor: UIColor.black,
+                NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 15),
+                NSAttributedString.Key.underlineStyle: NSNumber(value: 0)]
     }()
-    open var taggedAttributes: [NSAttributedStringKey: Any] = {return [NSAttributedStringKey.underlineStyle: NSNumber(value: 1)]}()
+    open var taggedAttributes: [NSAttributedString.Key: Any] = {return [NSAttributedString.Key.underlineStyle: NSNumber(value: 1)]}()
 
     public private(set) var taggedList: [TaggingModel] = []
     public weak var dataSource: TaggingDataSource?
@@ -71,7 +63,7 @@ open class Tagging: UIView {
 
     // MARK: - UI Components
 
-    open let textView: UITextView = {
+    public let textView: UITextView = {
         let textView = UITextView()
         textView.translatesAutoresizingMaskIntoConstraints = false
         return textView
@@ -100,7 +92,7 @@ open class Tagging: UIView {
         let tag = tagFormat(tagText)
         let replace = tag.appending(" ")
         let changed = (allText as NSString).replacingCharacters(in: range, with: replace)
-        let tagRange = NSMakeRange(range.location, tag.count)
+        let tagRange = NSMakeRange(range.location, tag.utf16.count)
 
         taggedList.append(TaggingModel(text: tagText, range: tagRange))
         for i in 0..<taggedList.count-1 {

Sources/TaggingDataSource.swift → Sources/Tagging/TaggingDataSource.swift

@@ -1,10 +1,3 @@
-//
-//  TaggingDataSource.swift
-//  Tagging
-//
-//  Created by DongHeeKang on 2018. 6. 24..
-//
-
 public protocol TaggingDataSource: class {
     func tagging(_ tagging: Tagging, didChangedTagableList tagableList: [String])
     func tagging(_ tagging: Tagging, didChangedTaggedList taggedList: [TaggingModel])

Sources/Tagging/TaggingModel.swift

@@ -0,0 +1,6 @@
+import Foundation
+
+public struct TaggingModel {
+    public var text: String
+    public var range: NSRange
+}

Sources/Tagging.h → Tagging.h

@@ -1,11 +1,3 @@
-//
-//  Tagging.h
-//  Tagging
-//
-//  Created by DongHeeKang on 2018. 7. 2..
-//  Copyright © 2018년 k-lpmg. All rights reserved.
-//
-
 #import <UIKit/UIKit.h>
 
 FOUNDATION_EXPORT double TaggingVersionNumber;

Tagging.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "Tagging"
-  s.version      = "0.3.0"
+  s.version      = "0.5.0"
   s.summary      = "TextView that provides a tagging feature to Mention or Hashtag"
   s.homepage     = "https://github.com/k-lpmg/Tagging"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
   s.author       = { "DongHee Kang" => "kanglpmg@gmail.com" }
   s.source       = { :git => "https://github.com/k-lpmg/Tagging.git", :tag => s.version.to_s }
   s.documentation_url = "https://github.com/k-lpmg/Tagging/blob/master/README.md"
 
-  s.ios.source_files  = "Sources/*.swift"
+  s.ios.source_files  = "Sources/**/*.swift"
   s.ios.deployment_target = "8.0"
 end