Merge pull request #169 from firebase/version_workflow

cynthiajoan · web-flow · commit aa2ee6914a46 · 2022-02-08T17:07:59.000-08:00
Fixing iOS packing issues
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -87,6 +87,11 @@ jobs:
         run: |
           echo "UNITY_ROOT_DIR=$( python scripts/gha/print_matrix_configuration.py -u ${{ github.event.inputs.unity_version }} -k unity_path )" >> $GITHUB_ENV
 
+      - name: Display Swig Version
+        shell: bash
+        run: |
+          swig -version
+
       - name: Build SDK (Android)
         shell: bash
         run: |
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -76,6 +76,11 @@ jobs:
         run: |
           echo "UNITY_ROOT_DIR=$( python scripts/gha/print_matrix_configuration.py -u ${{ github.event.inputs.unity_version }} -k unity_path )" >> $GITHUB_ENV
       
+      - name: Display Swig Version
+        shell: bash
+        run: |
+          swig -version
+
       - name: Build SDK (iOS)
         shell: bash
         run: |
diff --git a/.github/workflows/sdk_build.yml b/.github/workflows/sdk_build.yml
@@ -125,6 +125,11 @@ jobs:
           echo "$(swig -swiglib)" >> $GITHUB_PATH
           swig -swiglib
           echo "SWIG_DIR=$(swig -swiglib)" >> $GITHUB_ENV
+      
+      - name: Display Swig Version
+        shell: bash
+        run: |
+          swig -version
 
       - name: Build SDK (Linux)
         if: startsWith(matrix.os, 'ubuntu')
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ option(FIREBASE_INCLUDE_AUTH
        ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
 option(FIREBASE_INCLUDE_CRASHLYTICS
        "Include the Firebase Crashlytics library."
-       ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
+       OFF)
 option(FIREBASE_INCLUDE_DATABASE
        "Include the Firebase Realtime Database library."
        ${FIREBASE_INCLUDE_LIBRARY_DEFAULT})
@@ -304,7 +304,7 @@ endif()
 
 if(FIREBASE_UNI_LIBRARY)
   if(FIREBASE_IOS_BUILD)
-    ios_pack(firebase_lib_uni libFirebaseCppApp DEPS ${TARGET_LINK_LIB_NAMES})
+    ios_pack(firebase_lib_uni libFirebaseCppApp DEPS "firebase_app" "firebase_app_swig" "flatbuffers")
   else()
     build_uni(
       "${TARGET_LINK_LIB_NAMES}"
diff --git a/analytics/CMakeLists.txt b/analytics/CMakeLists.txt
@@ -50,13 +50,16 @@ mono_add_library(firebase_analytics_cs
     firebase_analytics_swig
 )
 
-build_firebase_shared(
-  analytics
-  analytics
-  FirebaseCppAnalytics
-)
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_analytics libFirebaseCppAnalytics DEPS firebase_analytics firebase_analytics_swig)
+else()
+  build_firebase_shared(
+    analytics
+    analytics
+    FirebaseCppAnalytics
+  )
+endif()
 
-unity_pack_native(firebase_analytics_swig)
 unity_pack_cs(firebase_analytics_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -99,7 +99,6 @@ mono_add_library(firebase_app_cs
     ${firebase_native_library}
 )
 
-unity_pack_native(firebase_app_swig)
 unity_pack_cs(firebase_app_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/app/src/swig/future.i b/app/src/swig/future.i
@@ -158,7 +158,11 @@ namespace firebase {
             null, System.IntPtr.Zero);
       }
       System.GC.SuppressFinalize(this);
+#if SWIG_VERSION >= 0x040000
+      base.Dispose(disposing);
+#else
       base.Dispose();
+#endif
     }
  }
 
diff --git a/app/src/swig/serial_dispose.i b/app/src/swig/serial_dispose.i
@@ -37,6 +37,10 @@
             null, global::System.IntPtr.Zero);
       }
       global::System.GC.SuppressFinalize(this);
+#if SWIG_VERSION >= 0x040000
+      base.Dispose(disposing);
+#else
       base.Dispose();
+#endif
     }
    }
diff --git a/auth/CMakeLists.txt b/auth/CMakeLists.txt
@@ -64,13 +64,16 @@ mono_add_library(firebase_auth_cs
     firebase_auth_swig
 )
 
-build_firebase_shared(
-  auth
-  auth
-  FirebaseCppAuth
-)
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_auth libFirebaseCppAuth DEPS firebase_auth firebase_auth_swig)
+else()
+  build_firebase_shared(
+    auth
+    auth
+    FirebaseCppAuth
+  )
+endif()
 
-unity_pack_native(firebase_auth_swig)
 unity_pack_cs(firebase_auth_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/cmake/build_shared.cmake b/cmake/build_shared.cmake
@@ -26,13 +26,20 @@ include(build_firebase_aar)
 function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
 
   set(shared_target "firebase_${LIBRARY_NAME}_shared")
+  
   add_library(${shared_target} SHARED
     ${FIREBASE_SOURCE_DIR}/empty.cc
+    $<TARGET_OBJECTS:firebase_${LIBRARY_NAME}>
+    $<TARGET_OBJECTS:firebase_${LIBRARY_NAME}_swig>
   )
+  
+  set(SHARED_TARGET_LINK_LIB_NAMES "firebase_${LIBRARY_NAME}" "firebase_${LIBRARY_NAME}_swig")
+
   target_link_libraries(${shared_target}
-    "firebase_${LIBRARY_NAME}_swig"
+    ${SHARED_TARGET_LINK_LIB_NAMES}
   )
 
+  # Update output name
   set_target_properties(${shared_target} 
     PROPERTIES
       OUTPUT_NAME "${OUTPUT_NAME}"
@@ -52,12 +59,28 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
         PREFIX "lib"
         SUFFIX ".a"
     )
+  elseif(ANDROID)
+    set_target_properties(${shared_target}
+      PROPERTIES
+        PREFIX "lib"
+    )
   else()
     set_target_properties(${shared_target}
       PROPERTIES
         PREFIX ""
     )
   endif()
+
+  if(ANDROID)
+    target_link_options(${shared_target}
+      PRIVATE
+        "-llog"
+        "-Wl,-z,defs"
+        "-Wl,--no-undefined"
+        # Link against the static libc++, which is the default done by Gradle.
+        "-static-libstdc++"
+    )
+  endif()
   
   unity_pack_native(${shared_target})
 
diff --git a/cmake/ios_pack.cmake b/cmake/ios_pack.cmake
@@ -19,6 +19,13 @@ if (CMAKE_INTERPROCEDURAL_OPTIMIZATION)
   set(ar_tool ${CMAKE_CXX_COMPILER_AR})
 endif()
 
+if(NOT CMAKE_LIBTOOL)
+  find_program(CMAKE_LIBTOOL NAMES libtool)
+endif()
+if(CMAKE_LIBTOOL)
+  set(CMAKE_LIBTOOL ${CMAKE_LIBTOOL} CACHE PATH "libtool executable")  
+endif()
+
 # Packs static libraries into one static library for ios and sets up the correct
 # install call for it
 #
@@ -49,7 +56,7 @@ macro(ios_pack name output_name)
       set(first false)
       string(APPEND content "cp $<TARGET_FILE:${dep}> ${TARGET_FILE}\n")
     else()
-      string(APPEND content "${ar_tool} -q $<TARGET_FILE:${dep}> ${TARGET_FILE}\n")
+      string(APPEND content "${CMAKE_LIBTOOL} -static -o ${TARGET_FILE} ${TARGET_FILE} $<TARGET_FILE:${dep}>\n")
     endif()
   endforeach()
 
diff --git a/cmake/unity_pack.cmake b/cmake/unity_pack.cmake
@@ -224,14 +224,16 @@ endfunction()
 #  * Libraries are put into build arch folder
 #
 function(unity_pack_native name)
-
   if(NOT FIREBASE_PACK_NATIVE)
     return()
   endif()
 
+  message("unity_pack_native pack ${name}")
+
   get_target_property(target_type ${name} TYPE)
 
   if(NOT "${target_type}" STREQUAL "SHARED_LIBRARY")
+    message("unity_pack_native ${target_type} not equal SHARED_LIBRARY, returned")
     return()
   endif()
 
diff --git a/crashlytics/CMakeLists.txt b/crashlytics/CMakeLists.txt
@@ -89,7 +89,16 @@ mono_add_library(firebase_crashlytics_cs
     FIREBASE_OPENSOURCE
 )
 
-unity_pack_native(firebase_crashlytics_swig)
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_crashlytics libFirebaseCppCrashlytics DEPS firebase_crashlytics firebase_crashlytics_swig)
+else()
+  build_firebase_shared(
+    crashlytics
+    crashlytics
+    FirebaseCppCrashlytics
+  )
+endif()
+
 unity_pack_cs(firebase_crashlytics_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/database/CMakeLists.txt b/database/CMakeLists.txt
@@ -68,13 +68,16 @@ mono_add_library(firebase_database_cs
     firebase_database_swig
 )
 
-build_firebase_shared(
-  database
-  database
-  FirebaseCppDatabase
-)
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_database libFirebaseCppDatabase DEPS firebase_database firebase_database_swig)
+else()
+  build_firebase_shared(
+    database
+    database
+    FirebaseCppDatabase
+  )
+endif()
 
-unity_pack_native(firebase_database_swig)
 unity_pack_cs(firebase_database_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/dynamic_links/CMakeLists.txt b/dynamic_links/CMakeLists.txt
@@ -62,13 +62,16 @@ mono_add_library(firebase_dynamic_links_cs
     firebase_dynamic_links_swig
 )
 
-build_firebase_shared(
-  dynamic_links
-  dynamic-links
-  FirebaseCppDynamicLinks
-)
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_dynamic_links libFirebaseCppDynamicLinks DEPS firebase_dynamic_links firebase_dynamic_links_swig)
+else()
+  build_firebase_shared(
+    dynamic_links
+    dynamic-links
+    FirebaseCppDynamicLinks
+  )
+endif()
 
-unity_pack_native(firebase_dynamic_links_swig)
 unity_pack_cs(firebase_dynamic_links_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/firestore/CMakeLists.txt b/firestore/CMakeLists.txt
@@ -142,13 +142,16 @@ mono_add_library(firebase_firestore_cs
     firebase_firestore_swig
 )
 
-build_firebase_shared(
-  firestore
-  firestore
-  FirebaseCppFirestore
-)
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_firestore libFirebaseCppFirestore DEPS firebase_firestore firebase_firestore_swig firebase_firestore_swig_cpp)
+else()
+  build_firebase_shared(
+    firestore
+    firestore
+    FirebaseCppFirestore
+  )
+endif()
 
-unity_pack_native(firebase_firestore_swig)
 unity_pack_cs(firebase_firestore_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/functions/CMakeLists.txt b/functions/CMakeLists.txt
@@ -54,13 +54,16 @@ mono_add_library(firebase_functions_cs
     firebase_functions_swig
 )
 
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_functions libFirebaseCppFunctions DEPS firebase_functions firebase_functions_swig)
+else()
 build_firebase_shared(
   functions
   functions
   FirebaseCppFunctions
 )
+endif()
 
-unity_pack_native(firebase_functions_swig)
 unity_pack_cs(firebase_functions_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/installations/CMakeLists.txt b/installations/CMakeLists.txt
@@ -61,13 +61,16 @@ mono_add_library(firebase_installations_cs
     firebase_installations_swig
 )
 
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_installations libFirebaseCppInstallations DEPS firebase_installations firebase_installations_swig)
+else()
 build_firebase_shared(
   installations
   installations
   FirebaseCppInstallations
 )
+endif()
 
-unity_pack_native(firebase_installations_swig)
 unity_pack_cs(firebase_installations_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/messaging/CMakeLists.txt b/messaging/CMakeLists.txt
@@ -51,13 +51,16 @@ mono_add_library(firebase_messaging_cs
     firebase_messaging_swig
 )
 
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_messaging libFirebaseCppMessaging DEPS firebase_messaging firebase_messaging_swig)
+else()
 build_firebase_shared(
   messaging
   messaging
   FirebaseCppMessaging
 )
+endif()
 
-unity_pack_native(firebase_messaging_swig)
 unity_pack_cs(firebase_messaging_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/remote_config/CMakeLists.txt b/remote_config/CMakeLists.txt
@@ -53,13 +53,16 @@ mono_add_library(firebase_remote_config_cs
     firebase_remote_config_swig
 )
 
+if(FIREBASE_IOS_BUILD)
+  ios_pack(firebase_lib_remote_config libFirebaseCppRemoteConfig DEPS firebase_remote_config firebase_remote_config_swig)
+else()
 build_firebase_shared(
   remote_config
   config
   FirebaseCppRemoteConfig
 )
+endif()
 
-unity_pack_native(firebase_remote_config_swig)
 unity_pack_cs(firebase_remote_config_cs)
 
 if (FIREBASE_INCLUDE_UNITY)
diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ mono_add_library(firebase_app_cs`
`99`	`99`	`${firebase_native_library}`
`100`	`100`	`)`
`101`	`101`
`102`		`-unity_pack_native(firebase_app_swig)`
`103`	`102`	`unity_pack_cs(firebase_app_cs)`
`104`	`103`
`105`	`104`	`if (FIREBASE_INCLUDE_UNITY)`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,11 @@ namespace firebase {`
`158`	`158`	`null, System.IntPtr.Zero);`
`159`	`159`	`}`
`160`	`160`	`System.GC.SuppressFinalize(this);`
	`161`	`+#if SWIG_VERSION >= 0x040000`
	`162`	`+ base.Dispose(disposing);`
	`163`	`+#else`
`161`	`164`	`base.Dispose();`
	`165`	`+#endif`
`162`	`166`	`}`
`163`	`167`	`}`
`164`	`168`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,10 @@`
`37`	`37`	`null, global::System.IntPtr.Zero);`
`38`	`38`	`}`
`39`	`39`	`global::System.GC.SuppressFinalize(this);`
	`40`	`+#if SWIG_VERSION >= 0x040000`
	`41`	`+ base.Dispose(disposing);`
	`42`	`+#else`
`40`	`43`	`base.Dispose();`
	`44`	`+#endif`
`41`	`45`	`}`
`42`	`46`	`}`