Merge branch 'hotfix-4.5.6' into master

.jazzy.yaml

@@ -3,11 +3,11 @@ sourcekitten_sourcefile: docs.json
 clean: true
 author: Timofey Solomko
 module: SWCompression
-module_version: 4.5.5
+module_version: 4.5.6
 copyright: '© 2020 Timofey Solomko'
 readme: README.md
 github_url: https://github.com/tsolomko/SWCompression
-github_file_prefix: https://github.com/tsolomko/SWCompression/tree/4.5.5
+github_file_prefix: https://github.com/tsolomko/SWCompression/tree/4.5.6
 theme: fullwidth
 
 custom_categories:

.travis.yml

@@ -47,6 +47,27 @@ jobs:
       - ./utils.py prepare-workspace macos
       script:
       - ./utils.py ci script-macos
+    - stage: test
+      language: swift
+      os: osx
+      osx_image: xcode12 # Swift 5.3
+      env:
+      - HOMEBREW_NO_INSTALL_CLEANUP=1
+      before_install:
+      - brew update
+      install:
+      - ./utils.py ci install-macos
+      before_script:
+      # - ./utils.py prepare-workspace macos
+      # TODO: Remove lines below when Carthage gets a workaround for problems with Xcode 12
+      - xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+      - trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+      - echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
+      - echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
+      - export XCODE_XCCONFIG_FILE="$xcconfig"
+      - carthage bootstrap
+      script:
+      - ./utils.py ci script-macos
     - stage: test
       language: generic
       os: linux
@@ -87,11 +108,21 @@ jobs:
       - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
       script:
       - ./utils.py ci script-linux
+    - stage: test
+      language: generic
+      os: linux
+      dist: xenial
+      env:
+      - SWIFT_VERSION=5.3
+      install:
+      - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
+      script:
+      - ./utils.py ci script-linux
     - stage: deploy
       if: tag IS present
       language: generic
       os: osx
-      osx_image: xcode11.3
+      osx_image: xcode11.4
       env:
       - HOMEBREW_NO_INSTALL_CLEANUP=1
       env:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.5.6
+
+- Fixed a compiling issue on Linux with Swift 5.3.
+
 ## 4.5.5
 
 - Fixed a crash which was sometimes happening when encountering non well-formed Extended Timestamp in ZIP files.

SWCompression.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "SWCompression"
-  s.version      = "4.5.5"
+  s.version      = "4.5.6"
   s.summary      = "A framework with functions for working with compression, archives and containers."
 
   s.description  = "A framework with (de)compression algorithms and functions for processing various archives and containers."

SWCompression.xcodeproj/SWCompression.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.5</string>
+	<string>4.5.6</string>
 	<key>CFBundleVersion</key>
-	<string>72</string>
+	<string>73</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2020 Timofey Solomko. All rights reserved.</string>
 </dict>

SWCompression.xcodeproj/TestSWCompression.plist

@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.5</string>
+	<string>4.5.6</string>
 	<key>CFBundleVersion</key>
-	<string>72</string>
+	<string>73</string>
 </dict>
 </plist>

SWCompression.xcodeproj/project.pbxproj

@@ -1240,7 +1240,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 72;
+				CURRENT_PROJECT_VERSION = 73;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1299,7 +1299,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 72;
+				CURRENT_PROJECT_VERSION = 73;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"FRAMEWORK_SEARCH_PATHS[sdk=appletvos*]" = "\"$(SRCROOT)/Carthage/Build/tvOS\"";
@@ -1339,7 +1339,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 72;
+				DYLIB_CURRENT_VERSION = 73;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = SWCompression.xcodeproj/SWCompression.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -1366,7 +1366,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 72;
+				DYLIB_CURRENT_VERSION = 73;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = SWCompression.xcodeproj/SWCompression.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

Sources/ZIP/ByteReader+Zip.swift

@@ -33,7 +33,11 @@ extension ByteReader {
 fileprivate extension String {
 
     #if os(Linux)
-        static let cp437Encoding: CFStringEncoding = UInt32(truncatingIfNeeded: UInt(kCFStringEncodingDOSLatinUS))
+        #if compiler(>=5.3)
+            static let cp437Encoding: CFStringEncoding = CFStringEncoding(CFStringEncodings.dosLatinUS.rawValue)
+        #else
+            static let cp437Encoding: CFStringEncoding = UInt32(truncatingIfNeeded: UInt(kCFStringEncodingDOSLatinUS))
+        #endif
         static let cp437Available: Bool = CFStringIsEncodingAvailable(cp437Encoding)
     #else
         static let cp437Encoding = CFStringEncoding(CFStringEncodings.dosLatinUS.rawValue)

Sources/swcomp/main.swift

@@ -7,7 +7,7 @@ import Foundation
 import SWCompression
 import SwiftCLI
 
-let cli = CLI(name: "swcomp", version: "4.5.5",
+let cli = CLI(name: "swcomp", version: "4.5.6",
               description: """
                            swcomp - small command-line client for SWCompression framework.
                            Serves as an example of SWCompression usage.