Merge pull request #82 from firebase/feature/monoupdate

Multiple Build fix

Author: cynthiajoan

.github/workflows/sdk_build.yml

@@ -7,12 +7,12 @@ on:
       # Which version of Unity to use
       unity_version:
         description: 'Unity version'
-        default: '2017.4.40f1'
+        default: '2019.4.30f1'
         required: true
       # Linux uses a different number for its versions
       linux_unity_version:
         description: 'Linux Unity version'
-        default: '2017.4.10f1'
+        default: '2019.4.32f1'
         required: true
       # Additional CMake flags to use
       additional_cmake_flags:
@@ -27,20 +27,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-latest, ubuntu-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
         include:
-        - os: windows-latest
-          unity_version: ${{ github.event.inputs.unity_version }}
-          unity_install_dir: TBD
-          build_dir: windows_unity
         - os: macos-latest
           unity_version: ${{ github.event.inputs.unity_version }}
           unity_install_dir: /Applications/Unity_${{ github.event.inputs.unity_version }}
           build_dir: macos_unity
+          unity_platform_name: macOS,iOS
+        - os: windows-latest
+          unity_version: ${{ github.event.inputs.unity_version }}
+          unity_install_dir: TBD
+          build_dir: windows_unity
+          unity_platform_name: Windows
         - os: ubuntu-latest
           unity_version: ${{ github.event.inputs.linux_unity_version }}
           unity_install_dir: /opt/unity-editor-${{ github.event.inputs.linux_unity_version }}
           build_dir: linux_unity
+          unity_platform_name: Linux
     env:
         # LC_ALL, LANG and U3D_PASSWORD are needed for U3D.
         LC_ALL: en_US.UTF-8
@@ -84,7 +87,7 @@ jobs:
       - name: Install Unity
         shell: bash
         run: |
-          python scripts/gha/unity_installer.py --install --platforms "Desktop" --version ${{ matrix.unity_version }}
+          python scripts/gha/unity_installer.py --install --platforms ${{ matrix.unity_platform_name }} --version ${{ matrix.unity_version }}
       - name: Setup Unity path
         shell: bash
         run: |

cmake/build_shared.cmake

@@ -32,11 +32,34 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
   target_link_libraries(${shared_target}
     "firebase_${LIBRARY_NAME}_swig"
   )
-  set_target_properties(${shared_target}
+
+  set_target_properties(${shared_target} 
     PROPERTIES
       OUTPUT_NAME "${OUTPUT_NAME}"
-      PREFIX "lib"
   )
+  if(APPLE AND NOT FIREBASE_IOS_BUILD)
+    # Other approach like set target link or set BUNDLE property fail due to
+    # trying to treat the bundle as a directory instead of a file.
+    # Only override suffix produces a single file bundle.
+    set_target_properties(${shared_target} 
+      PROPERTIES
+        PREFIX ""
+        SUFFIX ".bundle"
+    )
+  elseif(FIREBASE_IOS_BUILD)
+    set_target_properties(${shared_target}
+      PROPERTIES
+        PREFIX "lib"
+        SUFFIX ".a"
+    )
+  else()
+    set_target_properties(${shared_target}
+      PROPERTIES
+        PREFIX "lib"
+    )
+  endif()
+  
+  unity_pack_native(${shared_target})
 
   if(ANDROID)
     # Build the srcaar, and package it with CPack.

cmake/firebase_unity_version.cmake

@@ -14,7 +14,7 @@
 
 # This file defines the version numbers used by the Firebase Unity SDK.
 
-set(FIREBASE_UNITY_SDK_VERSION "8.1.0"
+set(FIREBASE_UNITY_SDK_VERSION "8.5.0"
     CACHE STRING "The version of the Unity SDK, used in the names of files.")
 
 set(FIREBASE_IOS_POD_VERSION "8.3.0"

cmake/unity_pack.cmake

@@ -37,9 +37,9 @@ if(FIREBASE_IOS_BUILD)
   set(UNITY_PACK_NATIVE_DIR "Plugins/iOS/Firebase")
 elseif("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "x64" OR
        "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "")
-  set(UNITY_PACK_NATIVE_DIR "Plugins/x86_64")
+  set(UNITY_PACK_NATIVE_DIR "Firebase/Plugins/x86_64")
 else()
-  set(UNITY_PACK_NATIVE_DIR "Plugins/x86_32")
+  set(UNITY_PACK_NATIVE_DIR "Firebase/Plugins/x86_32")
 endif()
 
 if(FIREBASE_IOS_BUILD)

firestore/src/swig/CMakeLists.txt

@@ -96,3 +96,17 @@ add_custom_target(
 
 add_dependencies(firebase_firestore_swig_cpp FIREBASE_FIRESTORE_SWIG_CPP_HEADERS)
 
+if(IOS)
+ # Enable Automatic Reference Counting (ARC).
+  set_property(
+    TARGET firebase_firestore
+    APPEND_STRING PROPERTY
+    COMPILE_FLAGS "-fobjc-arc")
+
+  setup_pod_headers(
+    firebase_firestore
+    POD_NAMES
+      FirebaseFirestore
+  )
+endif()
+

remote_config/CMakeLists.txt

@@ -25,6 +25,7 @@ set(firebase_remote_config_swig
 set(firebase_remote_config_src
   src/ConfigSettings.cs
   src/ConfigValue.cs
+  src/FirebaseRemoteConfig.cs
 )
 
 firebase_swig_add_library(firebase_remote_config_swig

scripts/gha/print_matrix_configuration.py

@@ -81,6 +81,7 @@
 UNITY_PACKAGES = {
   "2020.3.19f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]},
   "2019.4.30f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux-mono"]},
+  "2019.4.32f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["linux-il2cpp"]},
   "2018.4.36f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows-mono"], "macOS": None, "Linux": ["Linux"]},
   "2017.4.40f1": {"Default": ["Unity"], "Android": ["Android"], "iOS": ["Ios"], "Windows": ["Windows"], "macOS": None, "Linux": ["Linux"]}
 }