Reorganized main Xcode project.

dropbox · Sep 21, 2016 · 80964fe · 80964fe
1 parent 81e1e51
commit 80964fe
Show file tree

Hide file tree

Showing 15 changed files with 264 additions and 261 deletions.
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ Full documentation [here](http://dropbox.github.io/SwiftyDropbox/api-docs/latest
 
 ### Swift 3 Keychain bug
 
-> SwiftyDropbox currently supports Swift 3. However, there appears to be a bug with the Keychain in the iOS simulator environment where data is not persistently saved to the Keychain.
+> SwiftyDropbox currently supports Swift 3, Xcode 8 and iOS 10. However, there appears to be a bug with the Keychain in the iOS simulator environment where data is not persistently saved to the Keychain.
 >
 > As a temporary workaround, in the Project Navigator, select **your project** > **Capabilities** > **Keychain Sharing** > **ON**.
 >
@@ -143,7 +143,7 @@ brew install carthage
 
 ```
 # SwiftyDropbox
-github "https://github.com/dropbox/SwiftyDropbox" ~> 4.0.3
+github "https://github.com/dropbox/SwiftyDropbox" ~> 4.0.4
 ```
 
 Then, run the following command to install the dependency to checkout and build the Dropbox Swift SDK repository:
@@ -183,7 +183,7 @@ Then navigate to **Build Phases** > **+** > **New Copy Files Phase**. In the new
 
 Finally, you can also integrate the Dropbox Swift SDK into your project manually without using a dependency manager.
 
-Drag the `Source/SwiftyDropbox.xcodeproj` project into your project as a subproject.
+Drag the `Source/SwiftyDropbox/SwiftyDropbox.xcodeproj` project into your project as a subproject.
 
 Then, in the Project Navigator in Xcode, select your project, and then navigate to your project's build target > **General** > **Embedded Binaries** > **+** and then add `SwiftyDropbox.framework`.
 
@@ -709,7 +709,7 @@ DropboxClientsManager.setupWithAppKeyDesktop("<APP_KEY>", transportClient: trans
 
 #### Specify API call response queue
 
-You can also set custom response queues on a API call-by-call basis in the response handler:
+By default, response/progress handler code runs on the main thread. You can set a custom response queue for each API call that you make via the `response` method, in the event want your response/progress handler code to run on a different thread:
 
 ```Swift
 let client = DropboxClientsManager.authorizedClient!

diff --git a/Source/SwiftyDropbox/PlatformNeutral/DropboxTransportClient.swift b/Source/SwiftyDropbox/PlatformNeutral/DropboxTransportClient.swift
@@ -6,7 +6,7 @@ import Foundation
 import Alamofire
 
 open class DropboxTransportClient {
-    static let version = "4.0.3"
+    static let version = "4.0.4"
 
     open let manager: SessionManager
     open let backgroundManager: SessionManager

diff --git a/Source/SwiftyDropbox/SwiftyDropbox.xcodeproj/project.pbxproj b/Source/SwiftyDropbox/SwiftyDropbox.xcodeproj/project.pbxproj
diff --git a/...areddata/xcschemes/SwiftyDropbox.xcscheme → ...data/xcschemes/SwiftyDropbox iOS.xcscheme b/...areddata/xcschemes/SwiftyDropbox.xcscheme → ...data/xcschemes/SwiftyDropbox iOS.xcscheme
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "F2C6FCC41D89E16800E0DD9E"
                BuildableName = "SwiftyDropbox.framework"
-               BlueprintName = "SwiftyDropbox"
+               BlueprintName = "SwiftyDropbox iOS"
                ReferencedContainer = "container:SwiftyDropbox.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -47,7 +47,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F2C6FCC41D89E16800E0DD9E"
             BuildableName = "SwiftyDropbox.framework"
-            BlueprintName = "SwiftyDropbox"
+            BlueprintName = "SwiftyDropbox iOS"
             ReferencedContainer = "container:SwiftyDropbox.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -65,7 +65,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F2C6FCC41D89E16800E0DD9E"
             BuildableName = "SwiftyDropbox.framework"
-            BlueprintName = "SwiftyDropbox"
+            BlueprintName = "SwiftyDropbox iOS"
             ReferencedContainer = "container:SwiftyDropbox.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...ta/xcschemes/SwiftyDropbox_macOS.xcscheme → ...ta/xcschemes/SwiftyDropbox macOS.xcscheme b/...ta/xcschemes/SwiftyDropbox_macOS.xcscheme → ...ta/xcschemes/SwiftyDropbox macOS.xcscheme
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "F2C6FCD41D89E1A900E0DD9E"
-               BuildableName = "SwiftyDropbox_macOS.framework"
-               BlueprintName = "SwiftyDropbox_macOS"
+               BuildableName = "SwiftyDropbox.framework"
+               BlueprintName = "SwiftyDropbox macOS"
                ReferencedContainer = "container:SwiftyDropbox.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -46,8 +46,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F2C6FCD41D89E1A900E0DD9E"
-            BuildableName = "SwiftyDropbox_macOS.framework"
-            BlueprintName = "SwiftyDropbox_macOS"
+            BuildableName = "SwiftyDropbox.framework"
+            BlueprintName = "SwiftyDropbox macOS"
             ReferencedContainer = "container:SwiftyDropbox.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -64,8 +64,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "F2C6FCD41D89E1A900E0DD9E"
-            BuildableName = "SwiftyDropbox_macOS.framework"
-            BlueprintName = "SwiftyDropbox_macOS"
+            BuildableName = "SwiftyDropbox.framework"
+            BlueprintName = "SwiftyDropbox macOS"
             ReferencedContainer = "container:SwiftyDropbox.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...ce/SwiftyDropbox/SwiftyDropbox/Info.plist → ...wiftyDropbox/SwiftyDropbox_iOS/Info.plist b/...ce/SwiftyDropbox/SwiftyDropbox/Info.plist → ...wiftyDropbox/SwiftyDropbox_iOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>4.0.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/...iftyDropbox/SwiftyDropbox/SwiftyDropbox.h → ...Dropbox/SwiftyDropbox_iOS/SwiftyDropbox.h b/...iftyDropbox/SwiftyDropbox/SwiftyDropbox.h → ...Dropbox/SwiftyDropbox_iOS/SwiftyDropbox.h
diff --git a/...x/PlatformDependent/iOS/OAuthMobile.swift → ...x/SwiftyDropbox_iOS/iOS/OAuthMobile.swift b/...x/PlatformDependent/iOS/OAuthMobile.swift → ...x/SwiftyDropbox_iOS/iOS/OAuthMobile.swift
diff --git a/Source/SwiftyDropbox/SwiftyDropbox_macOS/Info.plist b/Source/SwiftyDropbox/SwiftyDropbox_macOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>4.0.4</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Source/SwiftyDropbox/SwiftyDropbox_macOS/SwiftyDropbox.h b/Source/SwiftyDropbox/SwiftyDropbox_macOS/SwiftyDropbox.h
@@ -0,0 +1,16 @@
+//
+//  SwiftyDropbox.h
+//  SwiftyDropbox
+//
+//  Copyright © 2016 Dropbox. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+//! Project version number for SwiftyDropbox.
+FOUNDATION_EXPORT double SwiftyDropboxVersionNumber;
+
+//! Project version string for SwiftyDropbox.
+FOUNDATION_EXPORT const unsigned char SwiftyDropboxVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <SwiftyDropbox/PublicHeader.h>
diff --git a/Source/SwiftyDropbox/SwiftyDropbox_macOS/SwiftyDropbox_macOS.h b/Source/SwiftyDropbox/SwiftyDropbox_macOS/SwiftyDropbox_macOS.h
diff --git a/...latformDependent/macOS/OAuthDesktop.swift → ...ftyDropbox_macOS/macOS/OAuthDesktop.swift b/...latformDependent/macOS/OAuthDesktop.swift → ...ftyDropbox_macOS/macOS/OAuthDesktop.swift
diff --git a/SwiftyDropbox.podspec b/SwiftyDropbox.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name         = 'SwiftyDropbox'
-  s.version      = '4.0.3'
+  s.version      = '4.0.4'
   s.summary      = 'Dropbox Swift SDK for API v2'
   s.homepage     = 'https://dropbox.com/developers/'
   s.license      = 'MIT'
   s.author       = { 'Stephen Cobbe' => 'scobbe@dropbox.com' }
   s.source       = { :git => 'https://github.com/dropbox/SwiftyDropbox.git', :tag => s.version }
 
-  s.osx.source_files = 'Source/SwiftyDropbox/SwiftyDropbox_macOS/SwiftyDropbox_macOS.h', 'Source/SwiftyDropbox/PlatformNeutral/*.{h,m,swift}', 'Source/SwiftyDropbox/PlatformDependent/macOS/*.{h,m,swift}'
-  s.ios.source_files = 'Source/SwiftyDropbox/SwiftyDropbox/SwiftyDropbox.h', 'Source/SwiftyDropbox/PlatformNeutral/*.{h,m,swift}', 'Source/SwiftyDropbox/PlatformDependent/iOS/*.{h,m,swift}'
+  s.osx.source_files = 'Source/SwiftyDropbox/PlatformNeutral/**/*.{swift,h}', 'Source/SwiftyDropbox/SwiftyDropbox_macOS/**/*.{swift,h}'
+  s.ios.source_files = 'Source/SwiftyDropbox/PlatformNeutral/**/*.{swift,h}', 'Source/SwiftyDropbox/SwiftyDropbox_iOS/**/*.{swift,h}'
 
   s.requires_arc = true
 

diff --git a/TestSwifty_iOS/Podfile.lock b/TestSwifty_iOS/Podfile.lock
@@ -12,7 +12,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: fef59f00388f267e52d9b432aa5d93dc97190f14
-  SwiftyDropbox: e29a9bf6be10999abd53ed925894e649ad6487a6
+  SwiftyDropbox: 5ed14e36c616836b697dbd2d5cc8578301121d87
 
 PODFILE CHECKSUM: cda7778a68b8e1516da95c603eec2ef267d40ce9
 

diff --git a/TestSwifty_macOS/Podfile.lock b/TestSwifty_macOS/Podfile.lock
@@ -12,7 +12,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Alamofire: fef59f00388f267e52d9b432aa5d93dc97190f14
-  SwiftyDropbox: e29a9bf6be10999abd53ed925894e649ad6487a6
+  SwiftyDropbox: 5ed14e36c616836b697dbd2d5cc8578301121d87
 
 PODFILE CHECKSUM: cc57984b506fe203ef20e31074601ff0a8af346e