Merge branch 'release-1.1.1'

tsolomko · Nov 20, 2016 · a635c37 · a635c37
2 parents 78b23ec + df1ed2f
commit a635c37
Show file tree

Hide file tree

Showing 19 changed files with 79 additions and 61 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode8
+osx_image: xcode8.1
 xcode_project: SWCompression.xcodeproj
 xcode_scheme: SWCompression
 env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog
+v1.1.1
+----------------
+- Fixed problems when building with Swift Package Manager.
+- Added missing files to watchOS scheme.
+- Every release on github now will have an archive with pre-built framework.
+- Added info about performance to README.
+
 v1.1.0
 ----------------
 - Added BZip2 decompression.

diff --git a/Package.swift b/Package.swift
@@ -3,6 +3,7 @@ import PackageDescription
 let package = Package(
     name: "SWCompression",
     exclude: [
+      "Sources/Service/",
       "Tests/"
     ]
 )
diff --git a/README.md b/README.md
@@ -96,6 +96,16 @@ let decompressedData = try? ZlibArchive.unarchive(archiveData: data)
 One final note: every unarchive/decompress function can throw an error and
 you are responsible for handling them.
 
+Why is it so slow?
+-------------
+Is it?
+
+The problem is that if SWCompression is built with 'Debug' configuration for some reason the performance is really bad.
+However, if you use 'Release' configuration varoius optimizations start to take effect and decompression speed will be much better.
+I don't know what is really happening, how Swift compiler works, etc., but bottomline is that you should REALLY use __'Release'__ builds of SWCompression.
+
+_Note:_ There are (mostly, were) performance problems caused by implementation (you can check out v1.0.0, if you want to know what is 'slow'!), but as the time goes on I am trying to find new ways to optimize the code.
+
 Future plans
 -------------
 - Performance improvement.

diff --git a/SWCompression.podspec b/SWCompression.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "SWCompression"
-  s.version      = "1.1.0"
+  s.version      = "1.1.1"
   s.summary      = "Framework with implementations in Swift of different (de)compression algorithms"
 
   s.description  = <<-DESC
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'Common' do |sp|
     sp.public_header_files = 'Sources/Service/SWCompression.h'
-    sp.source_files  = "Sources/{Common,Service}/*.{swift,h}"
+    sp.source_files  = "Sources/{DataWithPointer.swift,HuffmanTable.swift,HuffmanLength.swift,Protocols.swift,Extensions.swift,Service/*.swift,Service/*.h}"
   end
 
   s.subspec 'Deflate' do |sp|

diff --git a/SWCompression.xcodeproj/project.pbxproj b/SWCompression.xcodeproj/project.pbxproj
diff --git a/Sources/Common/DataWithPointer.swift → Sources/DataWithPointer.swift b/Sources/Common/DataWithPointer.swift → Sources/DataWithPointer.swift
diff --git a/Sources/Common/Extensions.swift → Sources/Extensions.swift b/Sources/Common/Extensions.swift → Sources/Extensions.swift
diff --git a/Sources/Common/HuffmanLength.swift → Sources/HuffmanLength.swift b/Sources/Common/HuffmanLength.swift → Sources/HuffmanLength.swift
diff --git a/Sources/Common/HuffmanTable.swift → Sources/HuffmanTable.swift b/Sources/Common/HuffmanTable.swift → Sources/HuffmanTable.swift
diff --git a/Sources/Common/Protocols.swift → Sources/Protocols.swift b/Sources/Common/Protocols.swift → Sources/Protocols.swift
diff --git a/Sources/Service/Info-iOS.plist b/Sources/Service/Info-iOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Service/Info-tvOS.plist b/Sources/Service/Info-tvOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Service/Info-watchOS.plist b/Sources/Service/Info-watchOS.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Sources/Service/Info.plist b/Sources/Service/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Tests/Bzip2Tests.swift b/Tests/Bzip2Tests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SWCompression
+import SWCompression
 
 class Bzip2Tests: XCTestCase {
 

diff --git a/Tests/GzipTests.swift b/Tests/GzipTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SWCompression
+import SWCompression
 
 class GzipTests: XCTestCase {
 

diff --git a/Tests/PerformanceTests.swift b/Tests/PerformanceTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SWCompression
+import SWCompression
 
 class PerformanceTests: XCTestCase {
 

diff --git a/Tests/ZlibTests.swift b/Tests/ZlibTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import SWCompression
+import SWCompression
 
 class ZlibTests: XCTestCase {