Package the Messaging java file and aar separately (#626)

* Package the Messaging java file and aar separately

* Add a custom target for the aar

* Update exports.json

* Add the java files to the Messaging packaging

* Update readme.md

* Update unity_pack.cmake

Author: a-maurice

cmake/android_dependencies.cmake

@@ -65,6 +65,7 @@ set(FIREBASE_MESSAGING_ANDROID_DEPS
     "com.google.firebase:firebase-messaging:23.1.2"
     "com.google.firebase:firebase-analytics:21.2.0"
     "com.google.firebase:firebase-iid:21.1.0"
+    "com.google.flatbuffers:flatbuffers-java:1.12.0"
 )
 
 set(FIREBASE_REMOTE_CONFIG_ANDROID_DEPS

cmake/unity_pack.cmake

@@ -298,29 +298,40 @@ endfunction()
 #
 # unity_pack_file(<file>
 #                 PACK_PATH
+#                 RENAME_TO
 # )
 #
 # Args:
 #  file: Path of file to pack
-#  pack_path: Destination to put the file in.
+#  PACK_PATH: Destination to put the file in.
+#  RENAME_TO: Optional parameter to rename the file.
 #
 # Notes:
 #  * Files are put into build arch folder
 #
 function(unity_pack_file file)
-  set(multi PACK_PATH)
-  # Parse the arguments into UNITY_MONO_SOURCES and UNITY_MONO_DEPENDS.
-  cmake_parse_arguments(UNITY_PACK "" "" "${multi}" ${ARGN})
+  set(single PACK_PATH RENAME_TO)
+  # Parse the arguments into UNITY_PACK_*.
+  cmake_parse_arguments(UNITY_PACK "" "${single}" "" ${ARGN})
 
   if("${UNITY_PACK_PACK_PATH}" STREQUAL "")
     set(UNITY_PACK_PACK_PATH ${UNITY_PACK_DEFAULT_CS_PATH})
   endif()
 
-  # meta file
-  install(
-    FILES ${file}
-    DESTINATION ${UNITY_PACK_PACK_PATH}
-  )
+  # Install the file to the PACK_PATH, renaming it if given RENAME_TO
+  if ("${UNITY_PACK_RENAME_TO}" STREQUAL "")
+    # Install the file to the PACK_PATH
+    install(
+      FILES ${file}
+      DESTINATION ${UNITY_PACK_PACK_PATH}
+    )
+  else()
+    install(
+      FILES ${file}
+      DESTINATION ${UNITY_PACK_PACK_PATH}
+      RENAME ${UNITY_PACK_RENAME_TO}
+    )
+  endif()
 endfunction()
 
 # Packs a aar file into the unity zip

docs/readme.md

@@ -69,6 +69,12 @@ Support
 
 Release Notes
 -------------
+### Upcoming
+- Changes
+    - Messaging (Android): Provide the custom MessagingUnityPlayerActivity
+      as a Java file instead of precompiling it. This is to better support
+      changes with the UnityPlayerActivity in the Unity 2023 editor.
+
 ### 10.6.0
 - Changes
     - General (Android): Update to Firebase Android BoM version 31.2.3.

messaging/CMakeLists.txt

@@ -71,8 +71,6 @@ build_firebase_shared(
   FirebaseCppMessaging
   ANDROID_MANIFEST
     "${CMAKE_CURRENT_LIST_DIR}/AndroidManifest.xml"
-  CLASSES_JAR
-    "${CMAKE_CURRENT_LIST_DIR}/activity/classes.jar"
 )
 endif()
 
@@ -89,6 +87,29 @@ if (FIREBASE_INCLUDE_UNITY)
   )
 endif()
 
+if (ANDROID)
+  # Add the additional Messaging files needed for Android
+  unity_pack_file(
+    "activity/com/google/firebase/MessagingUnityPlayerActivity.java"
+    PACK_PATH
+      "Firebase/Plugins/Android/"
+  )
+  # Get the Messaging Java AAR file from the C++ SDK.
+  add_custom_target(
+    firebase_messaging_java_aar_unity
+    ALL
+    DEPENDS firebase_messaging_java_aar
+  )
+  get_target_property(messaging_aar_file firebase_messaging_java_aar OBJECT_OUTPUTS)
+  unity_pack_file(
+    ${messaging_aar_file}
+    PACK_PATH
+      "Firebase/Plugins/Android/"
+    RENAME_TO
+      "firebase-messaging-cpp.aar"
+  )
+endif()
+
 set_property(TARGET firebase_messaging_cs
   PROPERTY FOLDER
   "Firebase ${FIREBASE_PLATFORM_NAME}"

messaging/activity/README.md

@@ -296,6 +296,15 @@
             "Firebase/Plugins/x86_64/FirebaseCppMessaging*"
           ]
         },
+        {
+          "importer": "PluginImporter",
+          "platforms": ["Android"],
+          "cpu": "AnyCPU",
+          "paths": [
+            "Firebase/Plugins/Android/MessagingUnityPlayerActivity.java",
+            "Firebase/Plugins/Android/firebase-messaging-cpp.aar"
+          ]
+        },
         {
           "importer": "DefaultImporter",
           "paths": [

messaging/activity/classes.jar

@@ -742,6 +742,15 @@
             "Firebase/Plugins/x86_64/FirebaseCppMessaging*"
           ]
         },
+        {
+          "importer": "PluginImporter",
+          "platforms": ["Android"],
+          "cpu": "AnyCPU",
+          "paths": [
+            "Firebase/Plugins/Android/MessagingUnityPlayerActivity.java",
+            "Firebase/Plugins/Android/firebase-messaging-cpp.aar"
+          ]
+        },
         {
           "importer": "DefaultImporter",
           "paths": ["Firebase/Editor/FirebaseMessaging*_manifest.txt"]

unity_packer/debug_single_export_json/messaging.json

@@ -437,6 +437,8 @@
         "Firebase/Editor/FirebaseMessaging_version-10.4.0_manifest.txt": "b3485828d4234137a8280f00a1f7b9ee",
         "Firebase/Editor/FirebaseRemoteConfig_version-10.4.0_manifest.txt": "b2256be1dfd54952908252655336b218",
         "Firebase/Editor/FirebaseStorage_version-10.4.0_manifest.txt": "981f0090257a44369332d6a7437869f3",
+        "Firebase/Plugins/Android/MessagingUnityPlayerActivity.java": "794c5e69320a44ca9d01f87f1019164e",
+        "Firebase/Plugins/Android/firebase-messaging-cpp.aar": "0be2cda49adc4b61a7e9eb9bf669fdab",
         "Firebase/Plugins/x86_64/FirebaseCppApp-10_4_0.bundle": "377df3b93de5491f8ca5dd75a1c63285",
         "Firebase/Plugins/x86_64/FirebaseCppApp-10_4_0.dll": "6008badfe2a9454c897af3b59668d865",
         "Firebase/Plugins/x86_64/FirebaseCppApp-10_4_0.so": "e2c049b2b0a44e3cb32171ad383d7bb1",