Merge branch 'release/4.0.1'

gethopscotch · Nov 1, 2017 · 733edac · 733edac
2 parents 8a4940a + 929ffcc
commit 733edac
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ DerivedData
 # SPM
 #
 .build
+Package.resolved
 Packages/
 
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 Change Log
 ==========================
 
+4.0.1
+--------------------------
+
+### Changes
+
+- Disable code coverage test.
+
+
 4.0.0
 --------------------------
 

diff --git a/Gzip.xcodeproj/xcshareddata/xcschemes/Gzip iOS.xcscheme b/Gzip.xcodeproj/xcshareddata/xcschemes/Gzip iOS.xcscheme
@@ -26,8 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -56,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/Gzip.xcodeproj/xcshareddata/xcschemes/Gzip macOS.xcscheme b/Gzip.xcodeproj/xcshareddata/xcschemes/Gzip macOS.xcscheme
@@ -26,8 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -56,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/GzipSwift.podspec b/GzipSwift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "GzipSwift"
-  s.version       = "4.0.0"
+  s.version       = "4.0.1"
   s.summary       = "Swift framework that enables gzip/gunzip Data using zlib."
 
   s.homepage      = "https://github.com/1024jp/GzipSwift"

diff --git a/Project/Info.plist b/Project/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.0.0</string>
+	<string>4.0.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Tests/GzipTests/GzipTests.swift b/Tests/GzipTests/GzipTests.swift
@@ -115,9 +115,9 @@ private extension String {
 
         var string = ""
         for _ in 0..<length {
-            let rand = Int(arc4random_uniform(UInt32(letters.characters.count)))
+            let rand = Int(arc4random_uniform(UInt32(letters.count)))
             let index = letters.index(letters.startIndex, offsetBy: rand)
-            let character = letters.characters[index]
+            let character = letters[index]
             string.append(character)
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ DerivedData @@
     # SPM
     #
     .build
+    Package.resolved
     Packages/
@@ Expand Down @@