Merge branch 'develop'

Author: p2

.jazzy.yaml

@@ -1,4 +1,9 @@
 # Jazzy config
+module:      OAuth2
+
 author_url:  http://www.github.com/p2
 root_url:    http://smart-on-fhir.github.io/Swift-SMART
 github_url:  http://p2.github.io/OAuth2
+
+theme:       fullwidth
+readme:      README.md

.travis.yml

@@ -2,6 +2,6 @@ language:      objective-c   # well "swift" actually
 osx_image:     xcode8
 xcode_project: OAuth2.xcodeproj
 xcode_scheme:  OAuth2OSX
-xcode_sdk:     macosx10.11
+xcode_sdk:     macosx
 script:
 - travis_wait xcodebuild

CHANGELOG.md

@@ -5,14 +5,25 @@ Version numbering represents the Swift version, plus a running number representi
 You can also refer to commit logs to get details on what was implemented, fixed and improved.
 
 
+### 3.0.0
+
+- Rewrite in Swift 3
+- New DataLoader, meaning you don't have to do authorization yourself (and helps with Alamofire use)
+- Broad API redesign, you should now use `authorize(params:callback:)` if you still authorize manually
+- All errors returned by OAuth2 are now `OAuth2Error` types
+- Add `Package.swift` for the Swift package manager
+- Expose `keychainAccessGroup` (`keychain_access_group` in settings; thanks @damienrambout !)
+- Some new errors (like `.forbidden` and `.missingState`)
+
+
 ### 2.3.0
 
 - Use Swift 2.3
 
 
 ### 2.2.9
 
-- Allow to add custom authentication headers (thanks @SpectralDragon)
+- Allow to add custom authorization headers (thanks @SpectralDragon)
 - Fix: add `client_id` to password grant even if there is no secret (thanks Criss!)
 
 
@@ -49,7 +60,7 @@ You can also refer to commit logs to get details on what was implemented, fixed
 
 ### 2.2.3
 
-- Refactor authentication request creation
+- Refactor authorization request creation
 - Add `OAuth2ClientCredentialsReddit` to deal with Reddit installed apps special flow
 - Rename clashing method definitions to fix #99
 

Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.0</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

OAuth2.xcodeproj/project.pbxproj

@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EEE209461942772800736F1A"
                BuildableName = "OAuth2.framework"
-               BlueprintName = "OAuth2OSX"
+               BlueprintName = "OAuth2macOS"
                ReferencedContainer = "container:OAuth2.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -58,7 +58,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EEE209461942772800736F1A"
             BuildableName = "OAuth2.framework"
-            BlueprintName = "OAuth2OSX"
+            BlueprintName = "OAuth2macOS"
             ReferencedContainer = "container:OAuth2.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -80,7 +80,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EEE209461942772800736F1A"
             BuildableName = "OAuth2.framework"
-            BlueprintName = "OAuth2OSX"
+            BlueprintName = "OAuth2macOS"
             ReferencedContainer = "container:OAuth2.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -98,7 +98,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EEE209461942772800736F1A"
             BuildableName = "OAuth2.framework"
-            BlueprintName = "OAuth2OSX"
+            BlueprintName = "OAuth2macOS"
             ReferencedContainer = "container:OAuth2.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

…cshareddata/xcschemes/OAuth2OSX.xcscheme …hareddata/xcschemes/OAuth2macOS.xcschemeOAuth2.xcodeproj/xcshareddata/xcschemes/OAuth2OSX.xcscheme renamed to OAuth2.xcodeproj/xcshareddata/xcschemes/OAuth2macOS.xcscheme OAuth2.xcodeproj/xcshareddata/xcschemes/OAuth2OSX.xcscheme renamed to OAuth2.xcodeproj/xcshareddata/xcschemes/OAuth2macOS.xcscheme

@@ -0,0 +1,36 @@
+//
+//  Package.swift
+//  OAuth2
+//
+//  Created by Pascal Pfiffner on 12/19/15.
+//  Copyright 2015 Pascal Pfiffner
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import PackageDescription
+
+let package = Package(
+	name: "OAuth2",
+	targets: [
+		Target(name: "SwiftKeychain"),
+		Target(name: "Base", dependencies: [.Target(name: "SwiftKeychain")]),
+		Target(name: "macOS", dependencies: [.Target(name: "Base")]),
+		Target(name: "Flows", dependencies: [.Target(name: "macOS")]),
+		Target(name: "DataLoader", dependencies: [.Target(name: "Flows")]),
+	],
+	dependencies: [
+		// SwiftKeychain is not yet available as a Package, so we symlink to /Sources and make it a Target
+		//.Package(url: "https://github.com/yankodimitrov/SwiftKeychain.git", majorVersion: 1),
+	]
+)