Remove FirebaseCore from project

hansemannn · Oct 18, 2017 · eb41f0d · eb41f0d
1 parent 5336b2a
commit eb41f0d
Show file tree

Hide file tree

Showing 39 changed files with 40 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -10,8 +10,6 @@ Use the native Firebase SDK in Axway Titanium. This repository is part of the [T
 
 #### Methods
 
-##### `configure()`
-
 ##### `log(name, parameters)`
   - `name` (String)
   - `parameters` (Dictionary)
@@ -36,11 +34,14 @@ Use the native Firebase SDK in Axway Titanium. This repository is part of the [T
 
 ## Example
 ```js
+// Require the Firebase Core module (own project!)
+var FirebaseCore = require('firebase.core');
+
 // Require the Firebase Analytics module
 var FirebaseAnalytics = require('firebase.analytics');
 
-// Configure FirebaseAnalytics
-FirebaseAnalytics.configure();
+// Configure Firebase
+FirebaseCore.configure();
 
 // Get the App Instance ID
 Ti.API.info('App Instance ID: ' + FirebaseAnalytics.appInstanceID);
@@ -69,7 +70,7 @@ FirebaseAnalytics.enabled = false;
 
 ## Build
 ```js
-cd iphone
+cd ios
 appc ti build -p ios --build-only
 ```
 

diff --git a/...tform/FirebaseCore.framework/FirebaseCore → ...hared/FirebaseCore.framework/FirebaseCore b/...tform/FirebaseCore.framework/FirebaseCore → ...hared/FirebaseCore.framework/FirebaseCore
diff --git a/...ework/Headers/FIRAnalyticsConfiguration.h → ...ework/Headers/FIRAnalyticsConfiguration.h b/...ework/Headers/FIRAnalyticsConfiguration.h → ...ework/Headers/FIRAnalyticsConfiguration.h
diff --git a/...m/FirebaseCore.framework/Headers/FIRApp.h → ...d/FirebaseCore.framework/Headers/FIRApp.h b/...m/FirebaseCore.framework/Headers/FIRApp.h → ...d/FirebaseCore.framework/Headers/FIRApp.h
diff --git a/...Core.framework/Headers/FIRConfiguration.h → ...Core.framework/Headers/FIRConfiguration.h b/...Core.framework/Headers/FIRConfiguration.h → ...Core.framework/Headers/FIRConfiguration.h
diff --git a/...amework/Headers/FIRCoreSwiftNameSupport.h → ...amework/Headers/FIRCoreSwiftNameSupport.h b/...amework/Headers/FIRCoreSwiftNameSupport.h → ...amework/Headers/FIRCoreSwiftNameSupport.h
diff --git a/...seCore.framework/Headers/FIRLoggerLevel.h → ...seCore.framework/Headers/FIRLoggerLevel.h b/...seCore.framework/Headers/FIRLoggerLevel.h → ...seCore.framework/Headers/FIRLoggerLevel.h
diff --git a/...rebaseCore.framework/Headers/FIROptions.h → ...rebaseCore.framework/Headers/FIROptions.h b/...rebaseCore.framework/Headers/FIROptions.h → ...rebaseCore.framework/Headers/FIROptions.h
diff --git a/...baseCore.framework/Headers/FirebaseCore.h → ...baseCore.framework/Headers/FirebaseCore.h b/...baseCore.framework/Headers/FirebaseCore.h → ...baseCore.framework/Headers/FirebaseCore.h
diff --git a/...seCore.framework/Modules/module.modulemap → ...seCore.framework/Modules/module.modulemap b/...seCore.framework/Modules/module.modulemap → ...seCore.framework/Modules/module.modulemap
diff --git a/...nostics.framework/FirebaseCoreDiagnostics → ...nostics.framework/FirebaseCoreDiagnostics b/...nostics.framework/FirebaseCoreDiagnostics → ...nostics.framework/FirebaseCoreDiagnostics
diff --git a/...ostics.framework/Modules/module.modulemap → ...ostics.framework/Modules/module.modulemap b/...ostics.framework/Modules/module.modulemap → ...ostics.framework/Modules/module.modulemap
diff --git a/...seInstanceID.framework/FirebaseInstanceID → ...seInstanceID.framework/FirebaseInstanceID b/...seInstanceID.framework/FirebaseInstanceID → ...seInstanceID.framework/FirebaseInstanceID
diff --git a/...tanceID.framework/Headers/FIRInstanceID.h → ...tanceID.framework/Headers/FIRInstanceID.h b/...tanceID.framework/Headers/FIRInstanceID.h → ...tanceID.framework/Headers/FIRInstanceID.h
diff --git a/...ID.framework/Headers/FirebaseInstanceID.h → ...ID.framework/Headers/FirebaseInstanceID.h b/...ID.framework/Headers/FirebaseInstanceID.h → ...ID.framework/Headers/FirebaseInstanceID.h
diff --git a/...anceID.framework/Modules/module.modulemap → ...anceID.framework/Modules/module.modulemap b/...anceID.framework/Modules/module.modulemap → ...anceID.framework/Modules/module.modulemap
diff --git a/...m/FirebaseNanoPB.framework/FirebaseNanoPB → ...d/FirebaseNanoPB.framework/FirebaseNanoPB b/...m/FirebaseNanoPB.framework/FirebaseNanoPB → ...d/FirebaseNanoPB.framework/FirebaseNanoPB
diff --git a/...olboxForMac.framework/GoogleToolboxForMac → ...olboxForMac.framework/GoogleToolboxForMac b/...olboxForMac.framework/GoogleToolboxForMac → ...olboxForMac.framework/GoogleToolboxForMac
diff --git a/...work/Headers/GTMDebugSelectorValidation.h → ...work/Headers/GTMDebugSelectorValidation.h b/...work/Headers/GTMDebugSelectorValidation.h → ...work/Headers/GTMDebugSelectorValidation.h
diff --git a/...mework/Headers/GTMDebugThreadValidation.h → ...mework/Headers/GTMDebugThreadValidation.h b/...mework/Headers/GTMDebugThreadValidation.h → ...mework/Headers/GTMDebugThreadValidation.h
diff --git a/...lboxForMac.framework/Headers/GTMDefines.h → ...lboxForMac.framework/Headers/GTMDefines.h b/...lboxForMac.framework/Headers/GTMDefines.h → ...lboxForMac.framework/Headers/GTMDefines.h
diff --git a/...ac.framework/Headers/GTMLocalizedString.h → ...ac.framework/Headers/GTMLocalizedString.h b/...ac.framework/Headers/GTMLocalizedString.h → ...ac.framework/Headers/GTMLocalizedString.h
diff --git a/...olboxForMac.framework/Headers/GTMLogger.h → ...olboxForMac.framework/Headers/GTMLogger.h b/...olboxForMac.framework/Headers/GTMLogger.h → ...olboxForMac.framework/Headers/GTMLogger.h
diff --git a/...ForMac.framework/Headers/GTMMethodCheck.h → ...ForMac.framework/Headers/GTMMethodCheck.h b/...ForMac.framework/Headers/GTMMethodCheck.h → ...ForMac.framework/Headers/GTMMethodCheck.h
diff --git a/...ForMac.framework/Headers/GTMNSData+zlib.h → ...ForMac.framework/Headers/GTMNSData+zlib.h b/...ForMac.framework/Headers/GTMNSData+zlib.h → ...ForMac.framework/Headers/GTMNSData+zlib.h
diff --git a/...rk/Headers/GTMNSDictionary+URLArguments.h → ...rk/Headers/GTMNSDictionary+URLArguments.h b/...rk/Headers/GTMNSDictionary+URLArguments.h → ...rk/Headers/GTMNSDictionary+URLArguments.h
diff --git a/...mework/Headers/GTMNSString+URLArguments.h → ...mework/Headers/GTMNSString+URLArguments.h b/...mework/Headers/GTMNSString+URLArguments.h → ...mework/Headers/GTMNSString+URLArguments.h
diff --git a/...Mac.framework/Headers/GTMStringEncoding.h → ...Mac.framework/Headers/GTMStringEncoding.h b/...Mac.framework/Headers/GTMStringEncoding.h → ...Mac.framework/Headers/GTMStringEncoding.h
diff --git a/...ForMac.framework/Headers/GTMTypeCasting.h → ...ForMac.framework/Headers/GTMTypeCasting.h b/...ForMac.framework/Headers/GTMTypeCasting.h → ...ForMac.framework/Headers/GTMTypeCasting.h
diff --git a/...xForMac.framework/Headers/GTMURLBuilder.h → ...xForMac.framework/Headers/GTMURLBuilder.h b/...xForMac.framework/Headers/GTMURLBuilder.h → ...xForMac.framework/Headers/GTMURLBuilder.h
diff --git a/...ForMac.framework/Modules/module.modulemap → ...ForMac.framework/Modules/module.modulemap b/...ForMac.framework/Modules/module.modulemap → ...ForMac.framework/Modules/module.modulemap
diff --git a/ios/shared/_README.md b/ios/shared/_README.md
@@ -0,0 +1,8 @@
+# README
+
+The frameworks in this directory are placed here intentionally, because they should not be packaged with the module
+to avoid duplicate framework references. They are delivered by the `titanium-firebase-core` module instead to retain
+a clean dependency-separation.
+
+## Questions
+For questions, reach out on TiSlack (@hans), thx!
diff --git a/ios/platform/nanopb.framework/Headers/pb.h → ios/shared/nanopb.framework/Headers/pb.h b/ios/platform/nanopb.framework/Headers/pb.h → ios/shared/nanopb.framework/Headers/pb.h
diff --git a/...form/nanopb.framework/Headers/pb_common.h → ...ared/nanopb.framework/Headers/pb_common.h b/...form/nanopb.framework/Headers/pb_common.h → ...ared/nanopb.framework/Headers/pb_common.h
diff --git a/...form/nanopb.framework/Headers/pb_decode.h → ...ared/nanopb.framework/Headers/pb_decode.h b/...form/nanopb.framework/Headers/pb_decode.h → ...ared/nanopb.framework/Headers/pb_decode.h
diff --git a/...form/nanopb.framework/Headers/pb_encode.h → ...ared/nanopb.framework/Headers/pb_encode.h b/...form/nanopb.framework/Headers/pb_encode.h → ...ared/nanopb.framework/Headers/pb_encode.h
diff --git a/...nanopb.framework/Modules/module.modulemap → ...nanopb.framework/Modules/module.modulemap b/...nanopb.framework/Modules/module.modulemap → ...nanopb.framework/Modules/module.modulemap
diff --git a/ios/platform/nanopb.framework/nanopb → ios/shared/nanopb.framework/nanopb b/ios/platform/nanopb.framework/nanopb → ios/shared/nanopb.framework/nanopb
diff --git a/ios/titanium-firebase-analytics.xcodeproj/project.pbxproj b/ios/titanium-firebase-analytics.xcodeproj/project.pbxproj
@@ -29,12 +29,12 @@
 		AA747D9F0F9514B9006C5449 /* FirebaseAnalytics_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* FirebaseAnalytics_Prefix.pch */; };
 		AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
 		DB073CC11F94013100E2F9D5 /* FirebaseAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB073CBE1F94008500E2F9D5 /* FirebaseAnalytics.framework */; };
-		DB073CC21F94013100E2F9D5 /* FirebaseCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB073CBC1F94008500E2F9D5 /* FirebaseCore.framework */; };
-		DB073CC31F94013100E2F9D5 /* FirebaseCoreDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB073CBF1F94008500E2F9D5 /* FirebaseCoreDiagnostics.framework */; };
-		DB073CC41F94013100E2F9D5 /* FirebaseInstanceID.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB073CBA1F94008500E2F9D5 /* FirebaseInstanceID.framework */; };
-		DB073CC51F94013100E2F9D5 /* FirebaseNanoPB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB073CC01F94008500E2F9D5 /* FirebaseNanoPB.framework */; };
-		DB073CC61F94013100E2F9D5 /* GoogleToolboxForMac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB073CBB1F94008500E2F9D5 /* GoogleToolboxForMac.framework */; };
-		DB073CC71F94013100E2F9D5 /* nanopb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB073CBD1F94008500E2F9D5 /* nanopb.framework */; };
+		DB15C7841F976F7A0054FD3A /* FirebaseCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB15C77E1F976F7A0054FD3A /* FirebaseCore.framework */; };
+		DB15C7851F976F7A0054FD3A /* FirebaseNanoPB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB15C77F1F976F7A0054FD3A /* FirebaseNanoPB.framework */; };
+		DB15C7861F976F7A0054FD3A /* GoogleToolboxForMac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB15C7801F976F7A0054FD3A /* GoogleToolboxForMac.framework */; };
+		DB15C7871F976F7A0054FD3A /* FirebaseCoreDiagnostics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB15C7811F976F7A0054FD3A /* FirebaseCoreDiagnostics.framework */; };
+		DB15C7881F976F7A0054FD3A /* nanopb.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB15C7821F976F7A0054FD3A /* nanopb.framework */; };
+		DB15C7891F976F7A0054FD3A /* FirebaseInstanceID.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB15C7831F976F7A0054FD3A /* FirebaseInstanceID.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -56,13 +56,13 @@
 		AA747D9E0F9514B9006C5449 /* FirebaseAnalytics_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FirebaseAnalytics_Prefix.pch; sourceTree = SOURCE_ROOT; };
 		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		D2AAC07E0554694100DB518D /* libfirebase.analytics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfirebase.analytics.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		DB073CBA1F94008500E2F9D5 /* FirebaseInstanceID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseInstanceID.framework; path = platform/FirebaseInstanceID.framework; sourceTree = "<group>"; };
-		DB073CBB1F94008500E2F9D5 /* GoogleToolboxForMac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleToolboxForMac.framework; path = platform/GoogleToolboxForMac.framework; sourceTree = "<group>"; };
-		DB073CBC1F94008500E2F9D5 /* FirebaseCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseCore.framework; path = platform/FirebaseCore.framework; sourceTree = "<group>"; };
-		DB073CBD1F94008500E2F9D5 /* nanopb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = nanopb.framework; path = platform/nanopb.framework; sourceTree = "<group>"; };
 		DB073CBE1F94008500E2F9D5 /* FirebaseAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseAnalytics.framework; path = platform/FirebaseAnalytics.framework; sourceTree = "<group>"; };
-		DB073CBF1F94008500E2F9D5 /* FirebaseCoreDiagnostics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseCoreDiagnostics.framework; path = platform/FirebaseCoreDiagnostics.framework; sourceTree = "<group>"; };
-		DB073CC01F94008500E2F9D5 /* FirebaseNanoPB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseNanoPB.framework; path = platform/FirebaseNanoPB.framework; sourceTree = "<group>"; };
+		DB15C77E1F976F7A0054FD3A /* FirebaseCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseCore.framework; path = shared/FirebaseCore.framework; sourceTree = "<group>"; };
+		DB15C77F1F976F7A0054FD3A /* FirebaseNanoPB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseNanoPB.framework; path = shared/FirebaseNanoPB.framework; sourceTree = "<group>"; };
+		DB15C7801F976F7A0054FD3A /* GoogleToolboxForMac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleToolboxForMac.framework; path = shared/GoogleToolboxForMac.framework; sourceTree = "<group>"; };
+		DB15C7811F976F7A0054FD3A /* FirebaseCoreDiagnostics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseCoreDiagnostics.framework; path = shared/FirebaseCoreDiagnostics.framework; sourceTree = "<group>"; };
+		DB15C7821F976F7A0054FD3A /* nanopb.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = nanopb.framework; path = shared/nanopb.framework; sourceTree = "<group>"; };
+		DB15C7831F976F7A0054FD3A /* FirebaseInstanceID.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FirebaseInstanceID.framework; path = shared/FirebaseInstanceID.framework; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -72,12 +72,12 @@
 			files = (
 				AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */,
 				DB073CC11F94013100E2F9D5 /* FirebaseAnalytics.framework in Frameworks */,
-				DB073CC21F94013100E2F9D5 /* FirebaseCore.framework in Frameworks */,
-				DB073CC31F94013100E2F9D5 /* FirebaseCoreDiagnostics.framework in Frameworks */,
-				DB073CC41F94013100E2F9D5 /* FirebaseInstanceID.framework in Frameworks */,
-				DB073CC51F94013100E2F9D5 /* FirebaseNanoPB.framework in Frameworks */,
-				DB073CC61F94013100E2F9D5 /* GoogleToolboxForMac.framework in Frameworks */,
-				DB073CC71F94013100E2F9D5 /* nanopb.framework in Frameworks */,
+				DB15C7841F976F7A0054FD3A /* FirebaseCore.framework in Frameworks */,
+				DB15C7891F976F7A0054FD3A /* FirebaseInstanceID.framework in Frameworks */,
+				DB15C7881F976F7A0054FD3A /* nanopb.framework in Frameworks */,
+				DB15C7871F976F7A0054FD3A /* FirebaseCoreDiagnostics.framework in Frameworks */,
+				DB15C7851F976F7A0054FD3A /* FirebaseNanoPB.framework in Frameworks */,
+				DB15C7861F976F7A0054FD3A /* GoogleToolboxForMac.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -107,12 +107,12 @@
 			isa = PBXGroup;
 			children = (
 				DB073CBE1F94008500E2F9D5 /* FirebaseAnalytics.framework */,
-				DB073CBC1F94008500E2F9D5 /* FirebaseCore.framework */,
-				DB073CBF1F94008500E2F9D5 /* FirebaseCoreDiagnostics.framework */,
-				DB073CBA1F94008500E2F9D5 /* FirebaseInstanceID.framework */,
-				DB073CC01F94008500E2F9D5 /* FirebaseNanoPB.framework */,
-				DB073CBB1F94008500E2F9D5 /* GoogleToolboxForMac.framework */,
-				DB073CBD1F94008500E2F9D5 /* nanopb.framework */,
+				DB15C77E1F976F7A0054FD3A /* FirebaseCore.framework */,
+				DB15C7811F976F7A0054FD3A /* FirebaseCoreDiagnostics.framework */,
+				DB15C7831F976F7A0054FD3A /* FirebaseInstanceID.framework */,
+				DB15C77F1F976F7A0054FD3A /* FirebaseNanoPB.framework */,
+				DB15C7801F976F7A0054FD3A /* GoogleToolboxForMac.framework */,
+				DB15C7821F976F7A0054FD3A /* nanopb.framework */,
 				AACBBE490F95108600F1A2B1 /* Foundation.framework */,
 			);
 			name = Frameworks;
@@ -250,6 +250,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/platform",
+					"$(PROJECT_DIR)/shared",
 				);
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -296,6 +297,7 @@
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/platform",
+					"$(PROJECT_DIR)/shared",
 				);
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_MODEL_TUNING = G5;