Merge pull request #41 from alikaragoz/master

Add `TUSKit.Framework`
tus · Feb 11, 2019 · f0520c5 · f0520c5
2 parents 4d6ae98 + f0cb73c
commit f0520c5
Show file tree

Hide file tree

Showing 31 changed files with 818 additions and 132 deletions.
diff --git a/Example/Podfile b/Example/Podfile
@@ -8,5 +8,4 @@ end
 
 target 'Tests' do
   pod "TUSKit", :path => "../"
-
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - TUSKit (1.3.8)
+  - TUSKit (1.3.12)
 
 DEPENDENCIES:
   - TUSKit (from `../`)
 
 EXTERNAL SOURCES:
   TUSKit:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
-  TUSKit: 9cca52b50b17ba92a166203c4f5e609c670a95ff
+  TUSKit: e032a6fec78aa0271ba1885908ea15a320c34aa8
 
-PODFILE CHECKSUM: 92550622848fc22aa648e69bd203ffac3b5d32b2
+PODFILE CHECKSUM: 55e2236f96d79d0c0d04ac02571d179181dfa764
 
-COCOAPODS: 1.2.1
+COCOAPODS: 1.6.0
diff --git a/Example/TUSKit.xcodeproj/project.pbxproj b/Example/TUSKit.xcodeproj/project.pbxproj
@@ -318,8 +318,6 @@
 				28C00B001ECD79F600430748 /* Sources */,
 				28C00B011ECD79F600430748 /* Frameworks */,
 				28C00B021ECD79F600430748 /* Resources */,
-				3508852BA91B7E96485DD5C7 /* [CP] Embed Pods Frameworks */,
-				D826D3F1084F37062B809103 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -374,8 +372,6 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				C03CA43257BBB1301472582B /* [CP] Embed Pods Frameworks */,
-				B8E61E5EE99B9EA138DCD59B /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -394,8 +390,6 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
-				96B0561881FD5CD66E610BE1 /* [CP] Embed Pods Frameworks */,
-				2C36823982C5A11655A46F3E /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -419,7 +413,7 @@
 				TargetAttributes = {
 					28C00B031ECD79F600430748 = {
 						CreatedOnToolsVersion = 8.3.2;
-						DevelopmentTeam = MPKS94G26Q;
+						DevelopmentTeam = W4KHXBA29T;
 						ProvisioningStyle = Automatic;
 					};
 					28C00B181ECD79F600430748 = {
@@ -435,7 +429,7 @@
 						TestTargetID = 28C00B031ECD79F600430748;
 					};
 					6003F589195388D20070C39A = {
-						DevelopmentTeam = MPKS94G26Q;
+						DevelopmentTeam = W4KHXBA29T;
 					};
 					6003F5AD195388D20070C39A = {
 						TestTargetID = 6003F589195388D20070C39A;
@@ -516,43 +510,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-TUSKit_MacOS_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		2C36823982C5A11655A46F3E /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		3508852BA91B7E96485DD5C7 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TUSKit_MacOS_Example/Pods-TUSKit_MacOS_Example-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		84022079743DAE094D266266 /* [CP] Check Pods Manifest.lock */ = {
@@ -561,73 +528,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		96B0561881FD5CD66E610BE1 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Tests/Pods-Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		B8E61E5EE99B9EA138DCD59B /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TUSKit/Pods-TUSKit-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C03CA43257BBB1301472582B /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TUSKit/Pods-TUSKit-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		D826D3F1084F37062B809103 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-TUSKit_MacOS_Example/Pods-TUSKit_MacOS_Example-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		DB0D5A03BA12C8E5F1B6AEAD /* [CP] Check Pods Manifest.lock */ = {
@@ -636,13 +546,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-TUSKit-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -770,7 +683,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = MPKS94G26Q;
+				DEVELOPMENT_TEAM = W4KHXBA29T;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "TUSKit MacOS Example/Info.plist";
@@ -799,7 +712,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = MPKS94G26Q;
+				DEVELOPMENT_TEAM = W4KHXBA29T;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "TUSKit MacOS Example/Info.plist";
@@ -1022,7 +935,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				DEVELOPMENT_TEAM = MPKS94G26Q;
+				DEVELOPMENT_TEAM = W4KHXBA29T;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "TUSKit/TUSKit-Prefix.pch";
 				INFOPLIST_FILE = "TUSKit/TUSKit-Info.plist";
@@ -1038,7 +951,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				DEVELOPMENT_TEAM = MPKS94G26Q;
+				DEVELOPMENT_TEAM = W4KHXBA29T;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "TUSKit/TUSKit-Prefix.pch";
 				INFOPLIST_FILE = "TUSKit/TUSKit-Info.plist";

diff --git a/Example/TUSKit/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/TUSKit/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -30,6 +40,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -64,6 +84,11 @@
       "idiom" : "ipad",
       "size" : "83.5x83.5",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

diff --git a/Pod/.DS_Store b/Pod/.DS_Store
diff --git a/Pod/Classes/TUSKit.xcconfig b/Pod/Classes/TUSKit.xcconfig
diff --git a/Supporting Files/Info iOS.plist b/Supporting Files/Info iOS.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>TUSKit</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 tus. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/Supporting Files/Info macOS.plist b/Supporting Files/Info macOS.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 tus. All rights reserved.</string>
+</dict>
+</plist>
diff --git a/Pod/Classes/TUSKit.h → Supporting Files/TUSKit.h b/Pod/Classes/TUSKit.h → Supporting Files/TUSKit.h
@@ -10,20 +10,32 @@
 //  Additions and changes for NSURLSession by Findyr
 //  Copyright (c) 2016 Findyr
 
+#import <Foundation/Foundation.h>
+#if TARGET_OS_IPHONE
+#import <UIKit/UIKit.h>
+#endif
+
 #define TUS_LOGGING_ENABLED 1
 #if TUS_LOGGING_ENABLED
-    #define TUSLog( s, ... ) NSLog( @"<%@:(%d)> %@", \
-        [[NSString stringWithUTF8String:__FILE__] lastPathComponent], \
-        __LINE__, \
-        [NSString stringWithFormat:(s), ##__VA_ARGS__])
+#define TUSLog( s, ... ) NSLog( @"<%@:(%d)> %@", \
+[[NSString stringWithUTF8String:__FILE__] lastPathComponent], \
+__LINE__, \
+[NSString stringWithFormat:(s), ##__VA_ARGS__])
 #else
-    #define TUSLog( s, ... ) ;
+#define TUSLog( s, ... ) ;
 #endif
 
-#import "TUSData.h"
 #import "TUSAssetData.h"
-#import "TUSResumableUpload.h"
+#import "TUSData.h"
+#import "TUSErrors.h"
+#import "TUSFileData.h"
 #import "TUSFileUploadStore.h"
-#import "TUSUploadStore.h"
+#import "TUSResumableUpload.h"
 #import "TUSSession.h"
-#import "TUSErrors.h"
+#import "TUSUploadStore.h"
+
+//! Project version number for TUSKit.
+FOUNDATION_EXPORT double TUSKitVersionNumber;
+
+//! Project version string for TUSKit.
+FOUNDATION_EXPORT const unsigned char TUSKitVersionString[];