Skip to content

Commit d4930ab

Browse files
auserauser
committed
Updates to Build process
1 parent 5566dc0 commit d4930ab

File tree

11 files changed

+50
-32
lines changed

11 files changed

+50
-32
lines changed

‎ios/Build-Debug.xcconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//
2+
// Build.xcconfig
3+
// Firestack
4+
//
5+
// Created by Ari Lerner on 7/28/16.
6+
// Copyright © 2016 Facebook. All rights reserved.
7+
//
8+
#include "Pods/Target Support Files/Pods-OAuthManager/Pods-OAuthManager.debug.xcconfig"
9+
10+
FRAMEWORK_SEARCH_PATHS = $(inherited) ${SRCROOT}/Pods/**
11+
HEADER_SEARCH_PATHS = $(inherited) ${SRCROOT}/../../React ${SRCROOT}/../../node_modules/react-native/React ${SRCROOT}/../../react-native/React
12+
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
13+
MACH_O_TYPE = mh_dynamic
14+
CLANG_ENABLE_MODULES=YES
15+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES
16+
USER_HEADER_SEARCH_PATHS = $(SRCROOT)/Pods/**/**

‎ios/OAuthManager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77

88
#import <Foundation/Foundation.h>
9+
#import "OAuthSwift-Swift.h"
910
#import "RCTBridgeModule.h"
1011
#import "RCTLinkingManager.h"
1112

‎ios/OAuthManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#import "OAuthManager.h"
1010

11-
@import OAuthSwift;
11+
//@import OAuthSwift;
1212

1313
typedef NSMutableDictionary *(^CustomSuccessHandler)(OAuthSwiftCredential *, NSURLResponse *, NSDictionary *, NSMutableDictionary*);
1414
typedef void (^OAuthHandler)(OAuthSwiftCredential *, NSURLResponse *, NSDictionary *);

‎ios/OAuthManager.xcodeproj/project.pbxproj

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
D3353820DF4005D16A481F41 /* Pods-OAuthManager.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OAuthManager.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OAuthManager/Pods-OAuthManager.debug.xcconfig"; sourceTree = "<group>"; };
6666
D991AB581D1B22F600DE9E58 /* OAuthManager-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OAuthManager-Bridging-Header.h"; sourceTree = "<group>"; };
6767
D991AB771D1B237400DE9E58 /* Pods.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Pods.xcodeproj; path = Pods/Pods.xcodeproj; sourceTree = "<group>"; };
68+
D99D32F51D4ADAEA00214DA9 /* Build-Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = "Build-Debug.xcconfig"; sourceTree = "<group>"; };
6869
E231954F0906492EED21005A /* Pods_OAuthManager.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OAuthManager.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6970
/* End PBXFileReference section */
7071

@@ -91,6 +92,7 @@
9192
58B511D21A9E6C8500147676 = {
9293
isa = PBXGroup;
9394
children = (
95+
D99D32F51D4ADAEA00214DA9 /* Build-Debug.xcconfig */,
9496
D991AB581D1B22F600DE9E58 /* OAuthManager-Bridging-Header.h */,
9597
13BE3DEC1AC21097009241FE /* OAuthManager.h */,
9698
13BE3DED1AC21097009241FE /* OAuthManager.m */,
@@ -282,6 +284,7 @@
282284
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
283285
COPY_PHASE_STRIP = NO;
284286
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
287+
ENABLE_BITCODE = NO;
285288
ENABLE_STRICT_OBJC_MSGSEND = YES;
286289
ENABLE_TESTABILITY = YES;
287290
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -334,6 +337,7 @@
334337
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
335338
COPY_PHASE_STRIP = YES;
336339
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
340+
ENABLE_BITCODE = NO;
337341
ENABLE_NS_ASSERTIONS = NO;
338342
ENABLE_STRICT_OBJC_MSGSEND = YES;
339343
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -362,9 +366,9 @@
362366
};
363367
58B511F01A9E6C8500147676 /* Debug */ = {
364368
isa = XCBuildConfiguration;
365-
baseConfigurationReference = D3353820DF4005D16A481F41 /* Pods-OAuthManager.debug.xcconfig */;
369+
baseConfigurationReference = D99D32F51D4ADAEA00214DA9 /* Build-Debug.xcconfig */;
366370
buildSettings = {
367-
DYLIB_INSTALL_NAME_BASE = "@rpath";
371+
DYLIB_INSTALL_NAME_BASE = "";
368372
ENABLE_BITCODE = NO;
369373
HEADER_SEARCH_PATHS = (
370374
"$(inherited)",
@@ -373,7 +377,7 @@
373377
"$(SRCROOT)/../../react-native/Libraries/LinkingIOS/**",
374378
"$(SRCROOT)/Libraries/**",
375379
);
376-
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
380+
LD_DYLIB_INSTALL_NAME = "";
377381
LIBRARY_SEARCH_PATHS = "$(inherited)";
378382
MACH_O_TYPE = mh_dylib;
379383
OTHER_LDFLAGS = (
@@ -390,7 +394,7 @@
390394
isa = XCBuildConfiguration;
391395
baseConfigurationReference = 98908608E773A354AA4AE920 /* Pods-OAuthManager.release.xcconfig */;
392396
buildSettings = {
393-
DYLIB_INSTALL_NAME_BASE = "@rpath";
397+
DYLIB_INSTALL_NAME_BASE = "";
394398
ENABLE_BITCODE = NO;
395399
HEADER_SEARCH_PATHS = (
396400
"$(inherited)",
@@ -399,7 +403,7 @@
399403
"$(SRCROOT)/../../react-native/Libraries/LinkingIOS/**",
400404
"$(SRCROOT)/Libraries/**",
401405
);
402-
LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)";
406+
LD_DYLIB_INSTALL_NAME = "";
403407
LIBRARY_SEARCH_PATHS = "$(inherited)";
404408
MACH_O_TYPE = mh_dylib;
405409
OTHER_LDFLAGS = (

‎ios/OAuthManager.xcodeproj/project.xcworkspace/xcuserdata/auser.xcuserdatad/UserInterfaceState.xcuserstate

-1.88 KB
Binary file not shown.

‎ios/Podfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
# Uncomment this line to define a global platform for your project
22
platform :ios, '8.0'
3+
use_frameworks!
34

45
target 'OAuthManager' do
5-
# Uncomment this line if you're using Swift or would like to use dynamic frameworks
6-
use_frameworks!
7-
podspec :path => "./OAuthManager.podspec"
6+
# podspec :path => "./OAuthManager.podspec"
87

98
# Pods for OauthManager
10-
# pod 'OAuthSwift', '~> 0.5.0'
9+
pod 'OAuthSwift', '~> 0.5.2'
1110
#
1211
#
1312
# post_install do |installer|

‎ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ PODS:
22
- OAuthSwift (0.5.2)
33

44
DEPENDENCIES:
5-
- OAuthSwift (~> 0.5.0)
5+
- OAuthSwift (~> 0.5.2)
66

77
SPEC CHECKSUMS:
88
OAuthSwift: 1ef042d4362e755e24a78f158d817245641a5d24
99

10-
PODFILE CHECKSUM: 6652921eb13e71cc2c30b442eddf3b88cbccddf9
10+
PODFILE CHECKSUM: 625b3da1546a4854cbd603ead2ae71830a78f435
1111

1212
COCOAPODS: 1.0.1

‎ios/Pods/Manifest.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios/Pods/Pods.xcodeproj/project.pbxproj

Lines changed: 8 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,13 @@
2626
"peerDependencies": {
2727
"react": "*",
2828
"react-native": "*"
29+
},
30+
"rnpm": {
31+
"ios": {
32+
"sharedLibraries": [
33+
"StoreKit.framework"
34+
],
35+
"project": "ios/OAuthManager.xcodeproj"
36+
}
2937
}
3038
}

‎react-native-oauth.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ const promisify = fn => (...args) => {
2222
export default class Manager {
2323
constructor(opts={}) {
2424
this._options = opts;
25-
26-
if (opts) {
27-
this.configureProviders(opts);
28-
}
2925
}
3026

3127
configureProvider(name, props) {

0 commit comments

Comments
 (0)