Merge 10.0.0 beta (#395)

.github/workflows/ci.yml

@@ -4,7 +4,8 @@ on: [pull_request, workflow_dispatch]
 jobs:
   test:
     name: Run Unit Tests
-    runs-on: macos-latest
+    runs-on: macos-13
+    timeout-minutes: 45
 
     steps:
       - name: Checkout
@@ -24,7 +25,7 @@ jobs:
           ACCOUNT_ID_2: ${{ secrets.ACCOUNT_ID_2 }}
           ACCOUNT_ID_3: ${{ secrets.ACCOUNT_ID_3 }}
           platform: ${{ 'iOS Simulator' }}
-          device: ${{ 'iPhone 13' }}
+          device: ${{ 'iPhone 14' }}
         run: |
           xcodebuild -workspace TestSwiftyDropbox/TestSwiftyDropbox.xcworkspace/ -scheme TestSwiftyDropbox_iOS -sdk iphonesimulator \
             -destination "platform=$platform,name=$device" \
@@ -38,14 +39,6 @@ jobs:
             ACCOUNT_ID_3=$ACCOUNT_ID_3 \
             test
 
-      - name: Set up keychain
-        env:
-          TEST_KEYCHAIN_PASSWORD: ${{ secrets.TEST_KEYCHAIN_PASSWORD }}
-        run: |
-          security create-keychain -p $TEST_KEYCHAIN_PASSWORD build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p $TEST_KEYCHAIN_PASSWORD build.keychain
-
       - name: Test macOS
         env:
           FULL_DROPBOX_API_APP_KEY: ${{ secrets.FULL_DROPBOX_API_APP_KEY }}

.gitignore

@@ -9,9 +9,9 @@ build/
 ## CocoaPods
 Pods/
 
-## Carthage
-Carthage/
-
 ## Swift Package Manager
 Packages/
-.build/
+.build/
+.swiftpm/xcode/xcuserdata
+.swiftpm/xcode/package.xcworkspace/xcuserdata
+

.swift-version

@@ -0,0 +1 @@
+5.6

.swiftformat

@@ -0,0 +1,24 @@
+--exclude stone,spec
+--ifdef no-indent
+--maxwidth 160
+--trimwhitespace always
+--hexliteralcase lowercase 
+--semicolons never 
+--stripunusedargs closure-only 
+--decimalgrouping 3 
+--disable trailingClosures
+--wraparguments before-first
+--wrapcollections before-first
+--wrapparameters before-first
+--closingparen balanced
+--self init-only
+--disable andOperator
+--disable linebreakAtEndOfFile
+--disable hoistPatternLet
+--specifierorder public,open,override
+--disable extensionAccessControl
+--disable wrapMultilineStatementBraces
+--disable redundantType
+--disable enumNamespaces
+--disable redundantClosure
+--disable redundantVoidReturnType

.swiftpm/xcode/package.xcworkspace/xcshareddata/IDETemplateMacros.plist

@@ -0,0 +1,10 @@
+<?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>FILEHEADER</key>
+	<string>/
+/// Copyright (c) ___YEAR___ Dropbox, Inc. All rights reserved.
+///</string>
+</dict>
+</plist>

Format/generate_docs.sh

@@ -20,7 +20,7 @@ else
             mkdir $docs_location
 
             echo "Generating documents..."
-            cd ../Source/SwiftyDropbox
+            cd ..
                 jazzy --readme $sdk_repo_location/README.md --config $sdk_repo_location/.jazzy.json --github_url https://github.com/dropbox/SwiftyDropbox --module-version $sdk_version --module SwiftyDropbox -o $docs_location
             cd -
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.6
 ///
 /// Copyright (c) 2016 Dropbox, Inc. All rights reserved.
 ///
@@ -8,20 +8,27 @@ import PackageDescription
 let package = Package(
     name: "SwiftyDropbox",
     platforms: [
-        .macOS(.v10_12),
-        .iOS(.v10),
+        .macOS(.v10_13),
+        .iOS(.v11),
     ],
     products: [
-        .library(name: "SwiftyDropbox", targets:["SwiftyDropbox"]),
-    ],
-    dependencies: [
-        .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.4.3")),
+        .library(name: "SwiftyDropbox", targets: ["SwiftyDropbox"]),
+        .library(name: "SwiftyDropboxObjC", targets: ["SwiftyDropboxObjC"]),
     ],
     targets: [
         .target(
             name: "SwiftyDropbox",
-            dependencies: ["Alamofire"],
-            path: "Source"
-        )
-    ]
+            path: "Source/SwiftyDropbox"
+        ),
+        .target(
+            name: "SwiftyDropboxObjC",
+            dependencies: ["SwiftyDropbox"],
+            path: "Source/SwiftyDropboxObjC"
+        ),
+        .testTarget(
+            name: "SwiftyDropboxUnitTests",
+            dependencies: ["SwiftyDropbox"]
+        ),
+    ],
+    swiftLanguageVersions: [.v5]
 )