Skip to content
This repository has been archived by the owner on Jul 18, 2020. It is now read-only.

Make it work with CP 1.0.0 #43

Merged
merged 3 commits into from
May 16, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion A0RNLock/Core/A0LockReact.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// THE SOFTWARE.

#import <Foundation/Foundation.h>
#import <Lock/A0Lock.h>
#import <Lock/Lock.h>

typedef void(^A0LockCallback)(NSArray *parameters);

Expand Down
2 changes: 0 additions & 2 deletions A0RNLock/Core/A0LockReact.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@

#import "A0LockReact.h"
#import <Lock/Lock.h>
#import <Lock/A0APIClient.h>
#import <Lock/A0Telemetry.h>
#import "A0Token+ReactNative.h"
#import "A0UserProfile+ReactNative.h"

Expand Down
2 changes: 1 addition & 1 deletion A0RNLock/Core/A0Token+ReactNative.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

#import <Lock/A0Token.h>
#import <Lock/Lock.h>
#import "A0DictionarySerialization.h"

@interface A0Token (ReactNative) <A0DictionarySerialization>
Expand Down
2 changes: 1 addition & 1 deletion A0RNLock/Core/A0UserIdentity+ReactNative.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

#import <Lock/A0UserIdentity.h>
#import <Lock/Lock.h>
#import "A0DictionarySerialization.h"

@interface A0UserIdentity (ReactNative) <A0DictionarySerialization>
Expand Down
2 changes: 1 addition & 1 deletion A0RNLock/Core/A0UserProfile+ReactNative.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

#import <Lock/A0UserProfile.h>
#import <Lock/Lock.h>
#import "A0DictionarySerialization.h"

@interface A0UserProfile (ReactNative) <A0DictionarySerialization>
Expand Down
3 changes: 3 additions & 0 deletions Podfile.template
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

# Auth0 Lock

pod 'Lock', '~> 1.24'
pod 'Lock/TouchID'
pod 'Lock/SMS'
Expand Down
5 changes: 4 additions & 1 deletion bin/cocoapods.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ fi

echo "Adding Podfile to iOS project"

cp $template $podfile >/dev/null 2>&1
cd ios
pod init >/dev/null 2>&1
cat $template >> $podfile
cd ..

echo "Installing Pods"

Expand Down
96 changes: 79 additions & 17 deletions sample-app/ios/LockReact.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

20 changes: 19 additions & 1 deletion sample-app/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
pod 'Lock', '~> 1.24'
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'

target 'LockReact' do
# Uncomment this line if you're using Swift or would like to use dynamic frameworks
# use_frameworks!

# Pods for LockReact

target 'LockReactTests' do
inherit! :search_paths
# Pods for testing
end

end

# Auth0 Lock

pod 'Lock', '~> 1.26'
pod 'Lock/TouchID'
pod 'Lock/SMS'
pod 'Lock/Email'
42 changes: 22 additions & 20 deletions sample-app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,41 @@ PODS:
- AFNetworking/Serialization (3.1.0)
- AFNetworking/UIKit (3.1.0):
- AFNetworking/NSURLSession
- CocoaLumberjack (2.2.0):
- CocoaLumberjack/Default (= 2.2.0)
- CocoaLumberjack/Extensions (= 2.2.0)
- CocoaLumberjack/Core (2.2.0)
- CocoaLumberjack/Default (2.2.0):
- CocoaLumberjack (2.3.0):
- CocoaLumberjack/Default (= 2.3.0)
- CocoaLumberjack/Extensions (= 2.3.0)
- CocoaLumberjack/Core (2.3.0)
- CocoaLumberjack/Default (2.3.0):
- CocoaLumberjack/Core
- CocoaLumberjack/Extensions (2.2.0):
- CocoaLumberjack/Extensions (2.3.0):
- CocoaLumberjack/Default
- Lock (1.24.1):
- Lock (1.26.0):
- CocoaLumberjack (~> 2.0)
- Lock/Core (= 1.24.1)
- Lock/UI (= 1.24.1)
- Lock/WebView (= 1.24.1)
- Lock/Core (1.24.1):
- Lock/Core (= 1.26.0)
- Lock/UI (= 1.26.0)
- Lock/WebView (= 1.26.0)
- Lock/Core (1.26.0):
- AFNetworking (~> 3.0)
- CocoaLumberjack (~> 2.0)
- Lock/CoreUI (1.24.1):
- Lock/CoreUI (1.26.0):
- CocoaLumberjack (~> 2.0)
- Lock/Core
- Masonry (~> 0.6)
- Lock/Email (1.24.1):
- Lock/Email (1.26.0):
- CocoaLumberjack (~> 2.0)
- Lock/UI
- Lock/SMS (1.24.1):
- Lock/SMS (1.26.0):
- CocoaLumberjack (~> 2.0)
- Lock/UI
- Lock/TouchID (1.24.1):
- Lock/TouchID (1.26.0):
- CocoaLumberjack (~> 2.0)
- Lock/UI
- SimpleKeychain (~> 0.2)
- TouchIDAuth (~> 0.1)
- Lock/UI (1.24.1):
- Lock/UI (1.26.0):
- CocoaLumberjack (~> 2.0)
- Lock/CoreUI
- Lock/WebView (1.24.1):
- Lock/WebView (1.26.0):
- CocoaLumberjack (~> 2.0)
- Lock/CoreUI
- Masonry (0.6.4)
Expand All @@ -64,10 +64,12 @@ DEPENDENCIES:

SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
Lock: 49139edbbde9e0bee0a7877c744de7a21eed638f
CocoaLumberjack: 97fab7ee5f507fe54445cca7ea80f926729cfd15
Lock: d863c3aebe57d2e8f3e5f40c9c5ba695ec2f1162
Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
SimpleKeychain: b50cef3b87939d480ea1143425c00f5b4b70fe21
TouchIDAuth: 0cf861f58a2cacfc1c12cb02de4850729d943c81

COCOAPODS: 0.39.0
PODFILE CHECKSUM: e411d40b83c979cadd05863d1857b7899c474ea9

COCOAPODS: 1.0.0