diff --git a/CHANGELOG.md b/CHANGELOG.md index bc6a29415..92edb916f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Change Log +## [2.0.0-rc.1](https://github.com/auth0/Lock.iOS-OSX/tree/2.0.0-rc.1) (2016-12-16) +[Full Changelog](https://github.com/auth0/Lock.iOS-OSX/compare/2.0.0-beta.2...2.0.0-rc.1) + +**Added** +- Feature password policy [\#354](https://github.com/auth0/Lock.iOS-OSX/pull/354) ([cocojoe](https://github.com/cocojoe)) +- Enterprise single domain support [\#343](https://github.com/auth0/Lock.iOS-OSX/pull/343) ([cocojoe](https://github.com/cocojoe)) +- Enterprise Active Auth [\#342](https://github.com/auth0/Lock.iOS-OSX/pull/342) ([cocojoe](https://github.com/cocojoe)) +- Enterprise support with db [\#340](https://github.com/auth0/Lock.iOS-OSX/pull/340) ([cocojoe](https://github.com/cocojoe)) +- Enterprise support with social [\#339](https://github.com/auth0/Lock.iOS-OSX/pull/339) ([cocojoe](https://github.com/cocojoe)) +- Enterprise Connection only authentication [\#336](https://github.com/auth0/Lock.iOS-OSX/pull/336) ([cocojoe](https://github.com/cocojoe)) + +**Changed** +- Compatibility updates against latest Auth0.Swift [\#356](https://github.com/auth0/Lock.iOS-OSX/pull/356) ([cocojoe](https://github.com/cocojoe)) +- Allow developer to get controller to show lock. [\#349](https://github.com/auth0/Lock.iOS-OSX/pull/349) ([hzalaz](https://github.com/hzalaz)) +- Migrate codebase to Swift 3.0 [\#345](https://github.com/auth0/Lock.iOS-OSX/pull/345) ([cocojoe](https://github.com/cocojoe)) + +**Fixed** +- Fixed retain issues between presenter and views [\#355](https://github.com/auth0/Lock.iOS-OSX/pull/355) ([cocojoe](https://github.com/cocojoe)) + ## [2.0.0-beta.2](https://github.com/auth0/Lock.iOS-OSX/tree/2.0.0-beta.2) (2016-09-20) [Full Changelog](https://github.com/auth0/Lock.iOS-OSX/compare/2.0.0-beta.1...2.0.0-beta.2) diff --git a/Lock.podspec b/Lock.podspec index b50a46f4a..a25318bd2 100644 --- a/Lock.podspec +++ b/Lock.podspec @@ -1,5 +1,5 @@ # version = `agvtool mvers -terse1`.strip -version = '2.0.0-beta.2' +version = '2.0.0-rc.1' Pod::Spec.new do |s| s.name = "Lock" s.version = version @@ -20,7 +20,7 @@ Auth0 is a SaaS that helps you with Authentication and Authorization. You can us s.requires_arc = true - s.dependency 'Auth0', '1.0.0-rc.3' + s.dependency 'Auth0', '~> 1.1' s.default_subspecs = 'Classic' s.subspec 'Classic' do |classic| diff --git a/Lock/Lock.swift b/Lock/Lock.swift index 41e306de2..a50c26109 100644 --- a/Lock/Lock.swift +++ b/Lock/Lock.swift @@ -244,7 +244,7 @@ private func telemetryFor(authentication: Authentication, webAuth: WebAuth) -> ( // FIXME:- Uncomment when stable is ready since XCode wont' accept a tag in the version // let bundle = _BundleHack.bundle // let version = bundle.infoDictionary?["CFBundleShortVersionString"] as? String ?? "2.0.0-alpha.0" - let version = "2.0.0-beta.2" + let version = "2.0.0-rc.1" authentication.using(inLibrary: name, version: version) webAuth.using(inLibrary: name, version: version) return (authentication, webAuth) diff --git a/README.md b/README.md index b13e7f7f6..05a8deea3 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,20 @@ Lock makes it easy to integrate SSO in your app. You won't have to worry about: ## Install +### CocoaPods + + Add the following line to your Podfile: + + ```ruby + pod "Lock", "~> 2.0.0-rc.1" + ``` + ### Carthage In your `Cartfile` add ``` -github "auth0/Lock.iOS-OSX" "2.0.0-beta.3" +github "auth0/Lock.iOS-OSX" "2.0.0-rc.1" ``` ## Usage