Upgrade to C++ SDK 8.10.0 and iOS SDK 8.13.0 (#3)

* Upgrade to cpp 8.10.0 and ios 8.13.0

* Update bob.yml

Author: britzl

.github/workflows/bob.yml

@@ -42,7 +42,7 @@ jobs:
   build_with_bob_macos:
     strategy:
       matrix:
-        platform: [armv7-darwin, x86_64-darwin]
+        platform: [arm64-darwin, x86_64-darwin]
     runs-on: macOS-latest
 
     name: Build

README.md

@@ -1,16 +1,19 @@
 [![Actions Status Alpha](https://github.com/defold/extension-firebase/actions/workflows/bob.yml/badge.svg)](https://github.com/defold/extension-firebase/actions)
 
+![](https://img.shields.io/badge/Firebase%20CPP%20SDK-8.10.0-green)
+![](https://img.shields.io/badge/Firebase%20iOS%20SDK-8.13.0-green)
+
+
 # Firebase
 Firebase is Google's mobile platform that helps you quickly develop high-quality apps and grow your business. This repository contains the core components required by the various products included in Firebase. It is not intended for use on its own.
 
 ---
 
 ## Development notes
-Use this guide when setting up or upgrading this core extension and the extensions for each of the Firebase products (such as analytics and remote config). The extensions are using the [Firebase C++ SDK](https://firebase.google.com/docs/cpp/setup). Current version: 7.3.0.
-
-* Download link: https://firebase.google.com/download/cpp
-* Direct download link: https://dl.google.com/firebase/sdk/cpp/firebase_cpp_sdk_7.3.0.zip
+Use this guide when setting up or upgrading this core extension and the extensions for each of the Firebase products (such as analytics and remote config). The extensions are using the [Firebase C++ SDK](https://firebase.google.com/docs/cpp/setup) and the [Firebase iOS SDK](https://github.com/firebase/firebase-ios-sdk).
 
+* Firebase C++ SDK download link: https://firebase.google.com/download/cpp
+* Firebase C++ SDK direct download link: https://dl.google.com/firebase/sdk/cpp/firebase_cpp_sdk_8.8.0.zip
 
 ### Copy includes
 Copy header files from `firebase_cpp_sdk/include`.
@@ -33,7 +36,9 @@ Android C++ libraries should be copied from the Firebase C++ SDK to your extensi
 
 
 #### Copy iOS dependencies
-Setup for iOS is made without CocoaPods using a direct download of the [Firebase iOS SDK from GitHub](https://github.com/firebase/firebase-ios-sdk/releases). It is important to use a version of the iOS SDK matching the iOS dependencies in `firebase_cpp_sdk/readme.md`.
+Setup for iOS is made without CocoaPods using a direct download of the Firebase iOS SDK. It is important to use a version of the iOS SDK matching the iOS dependencies in `firebase_cpp_sdk/readme.md`.
+
+* Firebase iOS SDK direct download link: https://github.com/firebase/firebase-ios-sdk/releases/download/8.10.0/Firebase.zip
 
 * Copy frameworks from iOS SDK. Check the included `firebase_ios_sdk/README.md` to learn which frameworks you need (most Firebase products require the frameworks for Firebase Analytics as well as the frameworks specific to the product). Note that Defold doesn't support `*.xcframework` files. You need to unpack/open all the `*.framework` files from `*.xcframework` and put to folders according to architecture.
    * `firebase_ios_sdk/FirebaseProduct/*.xcframework/ios-arm64_armv7/*.framework` -> `extension/lib/ios`

firebase/include/firebase/admob.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_H_
 
 #include "firebase/internal/platform.h"
 
@@ -154,4 +154,4 @@ void Terminate();
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_H_

firebase/include/firebase/admob/banner_view.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
 
 #include "firebase/admob/types.h"
 #include "firebase/future.h"
@@ -239,4 +239,4 @@ class BannerView {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_BANNER_VIEW_H_

firebase/include/firebase/admob/interstitial_ad.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
 
 #include "firebase/admob/types.h"
 #include "firebase/future.h"
@@ -160,4 +160,4 @@ class InterstitialAd {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_INTERSTITIAL_AD_H_

firebase/include/firebase/admob/native_express_ad_view.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
 
 #include "firebase/admob/types.h"
 #include "firebase/future.h"
@@ -313,4 +313,4 @@ class NativeExpressAdView {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_NATIVE_EXPRESS_AD_VIEW_H_

firebase/include/firebase/admob/rewarded_video.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
 
 #include <queue>
 #include <string>
@@ -227,4 +227,4 @@ void SetListener(Listener* listener);
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_REWARDED_VIDEO_H_

firebase/include/firebase/admob/types.h

@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
-#define FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#ifndef FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#define FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
 
 #include "firebase/internal/platform.h"
 
 #if FIREBASE_PLATFORM_ANDROID
 #include <jni.h>
-#elif FIREBASE_PLATFORM_IOS
+#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
 extern "C" {
 #include <objc/objc.h>
 }  // extern "C"
-#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS,
+        // FIREBASE_PLATFORM_TVOS
 
 namespace firebase {
 namespace admob {
@@ -40,13 +41,14 @@ namespace admob {
 #if FIREBASE_PLATFORM_ANDROID
 /// An Android Activity from Java.
 typedef jobject AdParent;
-#elif FIREBASE_PLATFORM_IOS
+#elif FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
 /// A pointer to an iOS UIView.
 typedef id AdParent;
 #else
 /// A void pointer for stub classes.
 typedef void *AdParent;
-#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS
+#endif  // FIREBASE_PLATFORM_ANDROID, FIREBASE_PLATFORM_IOS,
+        // FIREBASE_PLATFORM_TVOS
 
 #ifdef INTERNAL_EXPERIMENTAL
 // LINT.IfChange
@@ -175,4 +177,4 @@ struct BoundingBox {
 }  // namespace admob
 }  // namespace firebase
 
-#endif  // FIREBASE_ADMOB_CLIENT_CPP_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_
+#endif  // FIREBASE_ADMOB_SRC_INCLUDE_FIREBASE_ADMOB_TYPES_H_

firebase/include/firebase/analytics.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIREBASE_ANALYTICS_CLIENT_CPP_INCLUDE_FIREBASE_ANALYTICS_H_
-#define FIREBASE_ANALYTICS_CLIENT_CPP_INCLUDE_FIREBASE_ANALYTICS_H_
+#ifndef FIREBASE_ANALYTICS_SRC_INCLUDE_FIREBASE_ANALYTICS_H_
+#define FIREBASE_ANALYTICS_SRC_INCLUDE_FIREBASE_ANALYTICS_H_
 
 #include <cstddef>
 #include <cstdint>
@@ -497,18 +497,6 @@ void SetUserId(const char* user_id);
 /// session.
 void SetSessionTimeoutDuration(int64_t milliseconds);
 
-/// @brief Sets the current screen name and screen class, which specifies the
-/// current visual context in your app. This helps identify the areas in your
-/// app where users spend their time and how they interact with your app.
-///
-/// @param screen_name The name of the current screen. Set to nullptr to clear
-/// the current screen name. Limited to 100 characters.
-/// @param screen_class The name of the screen class. If you specify nullptr for
-/// this, it will use the default. On Android, the default is the class name of
-/// the current Activity. On iOS, the default is the class name of the current
-/// UIViewController. Limited to 100 characters.
-void SetCurrentScreen(const char* screen_name, const char* screen_class);
-
 /// Clears all analytics data for this app from the device and resets the app
 /// instance id.
 void ResetAnalyticsData();
@@ -533,4 +521,4 @@ Future<std::string> GetAnalyticsInstanceIdLastResult();
 }  // namespace analytics
 }  // namespace firebase
 
-#endif  // FIREBASE_ANALYTICS_CLIENT_CPP_INCLUDE_FIREBASE_ANALYTICS_H_
+#endif  // FIREBASE_ANALYTICS_SRC_INCLUDE_FIREBASE_ANALYTICS_H_