Merge pull request #112 from tus/release/2.2.0

Updating changelog and version identifiers for 2.2.0 release.

Author: tjeerdintveen

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## Upcoming version
+## 2.2.0
+
+- [MINOR] The example project now uses native iOS examples with PHPickerViewController and UIImagePickerController.
+- [MINOR] A http 300 status error is considered as an error. Ideally this will be a retry, but an automated retry mechanism is not yet in place.
+
+- [PATCH] The example project runs again
+- [PATCH] Added missing UIKit imports 
+- [PATCH] Fix canceling upload task
+- [PATCH] The example project doesn't rely on third party dependencies anymore.
 
-- [MINOR] Example project runs again
-- [MINOR] Removed POD dependencies in lockfile

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - TUSKit (2.1.0)
+  - TUSKit (2.2.0)
 
 DEPENDENCIES:
   - TUSKit (from `../`)

Example/TUSKit.xcodeproj/project.pbxproj

@@ -492,6 +492,7 @@
 				INFOPLIST_FILE = TUSKit/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 2.2.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -509,6 +510,7 @@
 				INFOPLIST_FILE = TUSKit/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				MARKETING_VERSION = 2.2.0;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";

Example/TUSKit/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>To Access Photos</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,13 +15,15 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>To Access Photos</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

TUSKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TUSKit'
-  s.version          = '2.1.0'
+  s.version          = '2.2.0'
   s.summary          = 'A rewrite of TUSKit, in Swift'
   s.swift_version = '5.0'