Merge pull request #94 from themackworth/release_1_1_1

themackworth · web-flow · commit 740053c30923 · 2017-08-15T10:31:15.000-07:00
Prepare for 1.1.1 release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file. SPTPersistentCache adheres to [Semantic Versioning](http://semver.org/).
 
 --
+## [1.1.1](https://github.com/spotify/SPTPersistentCache/releases/tag/1.1.1)
+_Released on 2017-08-15._
+
+### Fixed
+* SPTPersistentCacheOptions properties are now copied corrently when using `-copy`. 
 
 ## [1.1.0](https://github.com/spotify/SPTPersistentCache/releases/tag/1.1.0)
 _Released on 2016-11-18._
@@ -17,7 +22,7 @@ _Released on 2016-11-18._
 * Removed support for OSX 10.9.x.
 
 ### Changed
-* Now uses NSOperationQueues rather than GCD for prioritisation reasons.
+* Now uses NSOperationQueues rather than GCD for prioritization reasons.
 * Large removes, prunes and garbage collection routines are now asynchronous (this is an API breakage).
 
 ## [1.0.0](https://github.com/spotify/SPTPersistentCache/releases/tag/1.0.0)
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ $ gem install cocoapods
 ```
 Then simply add `SPTPersistentCache` to your `Podfile`.
 ```
-pod 'SPTPersistentCache', '~> 1.1.0'
+pod 'SPTPersistentCache', '~> 1.1.1'
 ```
 Lastly let CocoaPods do its thing by running:
 ```shell
@@ -49,7 +49,7 @@ $ brew install carthage
 ```
 You will also need to add `SPTPersistentCache` to your `Cartfile`:
 ```
-github 'spotify/SPTPersistentCache' ~> 1.1.0
+github 'spotify/SPTPersistentCache' ~> 1.1.1
 ```
 After that is all said and done, let Carthage pull in SPTPersistentCache like so:
 ```shell
diff --git a/SPTPersistentCache.podspec b/SPTPersistentCache.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
     s.name         = "SPTPersistentCache"
-    s.version      = "1.1.0"
+    s.version      = "1.1.1"
     s.summary      = "SPTPersistentCache is a fast, binary, LRU cache used in the Spotify iOS app"
 
     s.description  = <<-DESC
diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/AppDelegate.h b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/AppDelegate.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/AppDelegate.m b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/AppDelegate.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.h b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.m b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/DetailViewController.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/MasterViewController.h b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/MasterViewController.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/MasterViewController.m b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/MasterViewController.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/SPTPersistentCacheDemo/SPTPersistentCacheDemo/main.m b/SPTPersistentCacheDemo/SPTPersistentCacheDemo/main.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/SPTPersistentCacheFramework/Info.plist b/SPTPersistentCacheFramework/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Spotify. All rights reserved.</string>
+	<string>Copyright © 2017 Spotify. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/Sources/Categories/NSError+SPTPersistentCacheDomainErrors.h b/Sources/Categories/NSError+SPTPersistentCacheDomainErrors.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/Categories/NSError+SPTPersistentCacheDomainErrors.m b/Sources/Categories/NSError+SPTPersistentCacheDomainErrors.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCache+Private.h b/Sources/SPTPersistentCache+Private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCache.m b/Sources/SPTPersistentCache.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheDebugUtilities.h b/Sources/SPTPersistentCacheDebugUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheDebugUtilities.m b/Sources/SPTPersistentCacheDebugUtilities.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheFileManager+Private.h b/Sources/SPTPersistentCacheFileManager+Private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheFileManager.h b/Sources/SPTPersistentCacheFileManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheFileManager.m b/Sources/SPTPersistentCacheFileManager.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheGarbageCollector.h b/Sources/SPTPersistentCacheGarbageCollector.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheGarbageCollector.m b/Sources/SPTPersistentCacheGarbageCollector.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheHeader.m b/Sources/SPTPersistentCacheHeader.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheObjectDescription.h b/Sources/SPTPersistentCacheObjectDescription.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheObjectDescription.m b/Sources/SPTPersistentCacheObjectDescription.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheOptions.m b/Sources/SPTPersistentCacheOptions.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCachePosixWrapper.h b/Sources/SPTPersistentCachePosixWrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCachePosixWrapper.m b/Sources/SPTPersistentCachePosixWrapper.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheRecord+Private.h b/Sources/SPTPersistentCacheRecord+Private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheRecord.m b/Sources/SPTPersistentCacheRecord.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheResponse+Private.h b/Sources/SPTPersistentCacheResponse+Private.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheResponse.m b/Sources/SPTPersistentCacheResponse.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheTypeUtilities.h b/Sources/SPTPersistentCacheTypeUtilities.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/SPTPersistentCacheTypeUtilities.m b/Sources/SPTPersistentCacheTypeUtilities.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/crc32iso3309.c b/Sources/crc32iso3309.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Sources/crc32iso3309.h b/Sources/crc32iso3309.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/Info.plist b/Tests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.0</string>
+	<string>1.1.1</string>
 </dict>
 </plist>
diff --git a/Tests/NSError+SPTPersistentCacheDomainErrorsTests.m b/Tests/NSError+SPTPersistentCacheDomainErrorsTests.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/NSFileManagerMock.h b/Tests/NSFileManagerMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/NSFileManagerMock.m b/Tests/NSFileManagerMock.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheDebugUtilitiesTests.m b/Tests/SPTPersistentCacheDebugUtilitiesTests.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheFileManagerTests.m b/Tests/SPTPersistentCacheFileManagerTests.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheGarbageCollectorTests.m b/Tests/SPTPersistentCacheGarbageCollectorTests.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheHeaderTests.m b/Tests/SPTPersistentCacheHeaderTests.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheObjectDescriptionStyleValidator.h b/Tests/SPTPersistentCacheObjectDescriptionStyleValidator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheObjectDescriptionStyleValidator.m b/Tests/SPTPersistentCacheObjectDescriptionStyleValidator.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheObjectDescriptionTests.m b/Tests/SPTPersistentCacheObjectDescriptionTests.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheOptionsTests.m b/Tests/SPTPersistentCacheOptionsTests.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCachePerformanceTests.m b/Tests/SPTPersistentCachePerformanceTests.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCachePosixWrapperMock.h b/Tests/SPTPersistentCachePosixWrapperMock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCachePosixWrapperMock.m b/Tests/SPTPersistentCachePosixWrapperMock.m
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Spotify AB.
+ * Copyright (c) 2017 Spotify AB.
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/Tests/SPTPersistentCacheRecordTests.m b/Tests/SPTPersistentCacheRecordTests.m
diff --git a/Tests/SPTPersistentCacheResponseTests.m b/Tests/SPTPersistentCacheResponseTests.m
diff --git a/Tests/SPTPersistentCacheTests.m b/Tests/SPTPersistentCacheTests.m
diff --git a/Viewer/AppDelegate.h b/Viewer/AppDelegate.h
diff --git a/Viewer/AppDelegate.m b/Viewer/AppDelegate.m
diff --git a/Viewer/MainWindowController.h b/Viewer/MainWindowController.h
diff --git a/Viewer/MainWindowController.m b/Viewer/MainWindowController.m
diff --git a/Viewer/main.m b/Viewer/main.m
diff --git a/ci/expected_license_header.txt b/ci/expected_license_header.txt
diff --git a/include/SPTPersistentCache/SPTPersistentCache.h b/include/SPTPersistentCache/SPTPersistentCache.h
diff --git a/include/SPTPersistentCache/SPTPersistentCacheHeader.h b/include/SPTPersistentCache/SPTPersistentCacheHeader.h
diff --git a/include/SPTPersistentCache/SPTPersistentCacheOptions.h b/include/SPTPersistentCache/SPTPersistentCacheOptions.h
diff --git a/include/SPTPersistentCache/SPTPersistentCacheRecord.h b/include/SPTPersistentCache/SPTPersistentCacheRecord.h
diff --git a/include/SPTPersistentCache/SPTPersistentCacheResponse.h b/include/SPTPersistentCache/SPTPersistentCacheResponse.h
diff --git a/other/expected_license_header.txt b/other/expected_license_header.txt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2016 Spotify AB.`
	`2`	`+ * Copyright (c) 2017 Spotify AB.`
`3`	`3`	`*`
`4`	`4`	`* Licensed to the Apache Software Foundation (ASF) under one`
`5`	`5`	`* or more contributor license agreements. See the NOTICE file`