Skip to content

Commit 502615c

Browse files
mikelambertmikelambert
committed
Rename package prefixes to avoid FB conflicts.
1 parent 32f7d82 commit 502615c

File tree

10 files changed

+129
-26
lines changed

10 files changed

+129
-26
lines changed

‎android/src/main/java/org/jall/reactnative/firebase/FBAnalytics.java renamed to ‎android/src/main/java/org/jall/reactnative/firebase/FIRAnalytics.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
import com.facebook.react.bridge.ReadableMap;
1010
import com.google.firebase.analytics.FirebaseAnalytics;
1111

12-
public class FBAnalytics extends ReactContextBaseJavaModule {
12+
public class FIRAnalytics extends ReactContextBaseJavaModule {
1313
public Activity activity;
1414

15-
public FBAnalytics(ReactApplicationContext reactContext, Activity activity) {
15+
public FIRAnalytics(ReactApplicationContext reactContext, Activity activity) {
1616
super(reactContext);
1717
this.activity = activity;
1818
}
1919

2020
@Override
2121
public String getName() {
22-
return "FBAnalytics";
22+
return "FIRAnalytics";
2323
}
2424

2525
@ReactMethod

‎android/src/main/java/org/jall/reactnative/firebase/FBRemoteConfig.java renamed to ‎android/src/main/java/org/jall/reactnative/firebase/FIRRemoteConfig.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@
1111
import com.facebook.react.bridge.ReadableNativeArray;
1212
import com.facebook.react.bridge.ReadableNativeMap;
1313
import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
14+
import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
1415

1516
import java.util.ArrayList;
1617
import java.util.HashMap;
1718

18-
public class FBRemoteConfig extends ReactContextBaseJavaModule {
19+
public class FIRRemoteConfig extends ReactContextBaseJavaModule {
1920
public Activity activity;
2021

21-
public FBRemoteConfig(ReactApplicationContext reactContext, Activity activity) {
22+
public FIRRemoteConfig(ReactApplicationContext reactContext, Activity activity) {
2223
super(reactContext);
2324
this.activity = activity;
2425
}
2526

2627
@Override
2728
public String getName() {
28-
return "FBRemoteConfig";
29+
return "FIRRemoteConfig";
2930
}
3031

3132
@ReactMethod

‎android/src/main/java/org/jall/reactnative/firebase/FirebasePackage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public FirebasePackage(Activity activity) {
2222
public List<NativeModule> createNativeModules(
2323
ReactApplicationContext reactContext) {
2424
List<NativeModule> modules = new ArrayList<>();
25-
modules.add(new FBRemoteConfig(reactContext, mActivity));
26-
modules.add(new FBAnalytics(reactContext, mActivity));
25+
modules.add(new FIRRemoteConfig(reactContext, mActivity));
26+
modules.add(new FIRAnalytics(reactContext, mActivity));
2727
return modules;
2828
}
2929

‎ios/Firebase.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
D87A76C31C86A251004ABB23 /* FBAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = D87A76C01C86A251004ABB23 /* FBAnalytics.m */; };
11-
D87A76C41C86A251004ABB23 /* FBRemoteConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = D87A76C21C86A251004ABB23 /* FBRemoteConfig.m */; };
10+
D87A76C31C86A251004ABB23 /* FIRAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = D87A76C01C86A251004ABB23 /* FIRAnalytics.m */; };
11+
D87A76C41C86A251004ABB23 /* FIRRemoteConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = D87A76C21C86A251004ABB23 /* FIRRemoteConfig.m */; };
1212
/* End PBXBuildFile section */
1313

1414
/* Begin PBXCopyFilesBuildPhase section */
@@ -24,10 +24,10 @@
2424
/* End PBXCopyFilesBuildPhase section */
2525

2626
/* Begin PBXFileReference section */
27-
D87A76BF1C86A251004ABB23 /* FBAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FBAnalytics.h; path = Firebase/FBAnalytics.h; sourceTree = "<group>"; };
28-
D87A76C01C86A251004ABB23 /* FBAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FBAnalytics.m; path = Firebase/FBAnalytics.m; sourceTree = "<group>"; };
29-
D87A76C11C86A251004ABB23 /* FBRemoteConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FBRemoteConfig.h; path = Firebase/FBRemoteConfig.h; sourceTree = "<group>"; };
30-
D87A76C21C86A251004ABB23 /* FBRemoteConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FBRemoteConfig.m; path = Firebase/FBRemoteConfig.m; sourceTree = "<group>"; };
27+
D87A76BF1C86A251004ABB23 /* FIRAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FIRAnalytics.h; path = Firebase/FIRAnalytics.h; sourceTree = "<group>"; };
28+
D87A76C01C86A251004ABB23 /* FIRAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FIRAnalytics.m; path = Firebase/FIRAnalytics.m; sourceTree = "<group>"; };
29+
D87A76C11C86A251004ABB23 /* FIRRemoteConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FIRRemoteConfig.h; path = Firebase/FIRRemoteConfig.h; sourceTree = "<group>"; };
30+
D87A76C21C86A251004ABB23 /* FIRRemoteConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FIRRemoteConfig.m; path = Firebase/FIRRemoteConfig.m; sourceTree = "<group>"; };
3131
D8D9DB831C6D03DB009FBC0E /* libFirebase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFirebase.a; sourceTree = BUILT_PRODUCTS_DIR; };
3232
/* End PBXFileReference section */
3333

@@ -45,10 +45,10 @@
4545
D8D9DB5B1C6D01F4009FBC0E = {
4646
isa = PBXGroup;
4747
children = (
48-
D87A76BF1C86A251004ABB23 /* FBAnalytics.h */,
49-
D87A76C01C86A251004ABB23 /* FBAnalytics.m */,
50-
D87A76C11C86A251004ABB23 /* FBRemoteConfig.h */,
51-
D87A76C21C86A251004ABB23 /* FBRemoteConfig.m */,
48+
D87A76BF1C86A251004ABB23 /* FIRAnalytics.h */,
49+
D87A76C01C86A251004ABB23 /* FIRAnalytics.m */,
50+
D87A76C11C86A251004ABB23 /* FIRRemoteConfig.h */,
51+
D87A76C21C86A251004ABB23 /* FIRRemoteConfig.m */,
5252
D8D9DB661C6D01F4009FBC0E /* Products */,
5353
);
5454
sourceTree = "<group>";
@@ -117,8 +117,8 @@
117117
isa = PBXSourcesBuildPhase;
118118
buildActionMask = 2147483647;
119119
files = (
120-
D87A76C41C86A251004ABB23 /* FBRemoteConfig.m in Sources */,
121-
D87A76C31C86A251004ABB23 /* FBAnalytics.m in Sources */,
120+
D87A76C41C86A251004ABB23 /* FIRRemoteConfig.m in Sources */,
121+
D87A76C31C86A251004ABB23 /* FIRAnalytics.m in Sources */,
122122
);
123123
runOnlyForDeploymentPostprocessing = 0;
124124
};

‎ios/Firebase.xcodeproj/xcuserdata/lambert.xcuserdatad/xcschemes/Firebase.xcscheme

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0730"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "D8D9DB821C6D03DB009FBC0E"
18+
BuildableName = "libFirebase.a"
19+
BlueprintName = "Firebase"
20+
ReferencedContainer = "container:Firebase.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "D8D9DB821C6D03DB009FBC0E"
49+
BuildableName = "libFirebase.a"
50+
BlueprintName = "Firebase"
51+
ReferencedContainer = "container:Firebase.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "D8D9DB821C6D03DB009FBC0E"
67+
BuildableName = "libFirebase.a"
68+
BlueprintName = "Firebase"
69+
ReferencedContainer = "container:Firebase.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

‎ios/Firebase.xcodeproj/xcuserdata/lambert.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>Firebase.xcscheme</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>13</integer>
11+
</dict>
12+
</dict>
13+
<key>SuppressBuildableAutocreation</key>
14+
<dict>
15+
<key>D8D9DB821C6D03DB009FBC0E</key>
16+
<dict>
17+
<key>primary</key>
18+
<true/>
19+
</dict>
20+
</dict>
21+
</dict>
22+
</plist>

‎ios/Firebase/FBAnalytics.h renamed to ‎ios/Firebase/FIRAnalytics.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import <Foundation/Foundation.h>
22
#import "RCTBridgeModule.h"
33

4-
@interface FBAnalytics : NSObject <RCTBridgeModule>
4+
@interface FIRAnalytics : NSObject <RCTBridgeModule>
55

66
@end
77

‎ios/Firebase/FBAnalytics.m renamed to ‎ios/Firebase/FIRAnalytics.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#import "FBAnalytics.h"
1+
#import "FIRAnalytics.h"
22
@import Firebase;
33

4-
@implementation FBAnalytics
4+
@implementation FIRAnalytics
55
@synthesize bridge = _bridge;
66

77
RCT_EXPORT_MODULE();

‎ios/Firebase/FBRemoteConfig.h renamed to ‎ios/Firebase/FIRRemoteConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import <Foundation/Foundation.h>
22
#import "RCTBridgeModule.h"
33

4-
@interface FBRemoteConfig : NSObject <RCTBridgeModule>
4+
@interface FIRRemoteConfig : NSObject <RCTBridgeModule>
55

66
@end

‎ios/Firebase/FBRemoteConfig.m renamed to ‎ios/Firebase/FIRRemoteConfig.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#import "FBRemoteConfig.h"
1+
#import "FIRRemoteConfig.h"
22
@import Firebase;
33

4-
@implementation FBRemoteConfig
4+
@implementation FIRRemoteConfig
55
@synthesize bridge = _bridge;
66

77
RCT_EXPORT_MODULE();

0 commit comments

Comments
 (0)