liyanhuadev · James-Chi-Jie · Nov 18, 2021
diff --git a/.DS_Store b/.DS_Store
diff --git a/ExCommand/Source/MatchResult.swift b/ExCommand/Source/MatchResult.swift
@@ -94,23 +94,23 @@ private final class _MatchResult {
   }
 #endif
 
-  lazy var range: Range<String.UTF16Index> = {
+  lazy var range: Range<String.Index> = {
     return self.rangeFromNSRange(self.string, self.result.range)!
   }()
 
   lazy var captures: [String?] = {
     return self.captureRanges.map { $0.map { self.substringFromRange(self.string, $0) } }
   }()
 
-  lazy var captureRanges: [Range<String.UTF16Index>?] = {
+  lazy var captureRanges: [Range<String.Index>?] = {
     return self.result.ranges.dropFirst().map { self.rangeFromNSRange(self.string, $0) }
   }()
 
   lazy var matchedString: String = {
     return self.substringFromRange(self.string, self.rangeFromNSRange(self.string, self.result.range)!)
   }()
 
-  private let rangeFromNSRange: (String.UTF16View, NSRange) -> Range<String.UTF16Index>? = { string, range in
+  private let rangeFromNSRange: (String.UTF16View, NSRange) -> Range<String.Index>? = { string, range in
     guard range.location != NSNotFound else { return nil }
 
 #if swift(>=3.0)

diff --git a/ObjectMapper-Plugin.xcodeproj/project.pbxproj b/ObjectMapper-Plugin.xcodeproj/project.pbxproj
diff --git a/ObjectMapper-Plugin.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ObjectMapper-Plugin.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/ObjectMapper-Plugin.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ObjectMapper-Plugin.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/ObjectMapper-Plugin.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ObjectMapper-Plugin.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ObjectMapper-Plugin.xcworkspace/contents.xcworkspacedata b/ObjectMapper-Plugin.xcworkspace/contents.xcworkspacedata
diff --git a/ObjectMapper-Plugin/RegexSwift/MatchResult.swift b/ObjectMapper-Plugin/RegexSwift/MatchResult.swift
@@ -94,23 +94,23 @@ private final class _MatchResult {
   }
 #endif
 
-  lazy var range: Range<String.UTF16Index> = {
+  lazy var range: Range<String.Index> = {
     return self.rangeFromNSRange(self.string, self.result.range)!
   }()
 
   lazy var captures: [String?] = {
     return self.captureRanges.map { $0.map { self.substringFromRange(self.string, $0) } }
   }()
 
-  lazy var captureRanges: [Range<String.UTF16Index>?] = {
+  lazy var captureRanges: [Range<String.Index>?] = {
     return self.result.ranges.dropFirst().map { self.rangeFromNSRange(self.string, $0) }
   }()
 
   lazy var matchedString: String = {
     return self.substringFromRange(self.string, self.rangeFromNSRange(self.string, self.result.range)!)
   }()
 
-    private let rangeFromNSRange: (String.UTF16View, NSRange) -> Range<String.UTF16Index>? = { string, range in
+    private let rangeFromNSRange: (String.UTF16View, NSRange) -> Range<String.Index>? = { string, range in
         guard range.location != NSNotFound else { return nil }
 
         #if swift(>=3.0)

diff --git a/Podfile b/Podfile
diff --git a/Podfile.lock b/Podfile.lock
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/ObjectMapper/LICENSE b/Pods/ObjectMapper/LICENSE