Merge pull request #43 from firebase/am-mac-fixes

Remove swig update logic, add openssl, and fix iOS packaging

Author: a-maurice

.github/workflows/sdk_build.yml

@@ -70,20 +70,6 @@ jobs:
           python scripts/gha/install_prereqs_desktop.py
           cd ..
 
-      - name: Install swig (Linux)
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          sudo apt-get remove -y swig
-          sudo apt-get remove -y swig4.0
-          sudo apt-get install -y swig3.0
-          alias swig='swig3.0'
-
-      # TODO: Change the swig versions installed on Mac and Windows
-      - name: Install swig (Mac & Windows)
-        if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'windows')
-        run: |
-          swig -version
-
       # Set up the requirements, and install Unity
       - uses: ruby/setup-ruby@v1
         with:
@@ -104,6 +90,17 @@ jobs:
         run: |
           echo "UNITY_ROOT_DIR=${{ matrix.unity_install_dir }}" >> $GITHUB_ENV
 
+      - name: Install OpenSSL (Linux)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          sudo apt install openssl
+      - name: Install OpenSSL (macOS)
+        if: startsWith(matrix.os, 'macos')
+        run: |
+          brew install openssl
+          # brew won't overwrite MacOS system default OpenSSL, so force it here.
+          echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl --installed)" >> $GITHUB_ENV
+
       - name: Build SDK (Linux)
         if: startsWith(matrix.os, 'ubuntu')
         shell: bash

external/CMakeLists.txt

@@ -17,14 +17,14 @@
 
 mono_add_external_dll(unity_editor_cs "${UNITY_EDITOR_DLL}")
 mono_add_external_dll(unity_engine_cs "${UNITY_ENGINE_DLL}")
-if(APPLE)
+if(FIREBASE_IOS_BUILD)
   mono_add_external_dll(unity_ios_extensions_xcode_cs "${UNITY_EDITOR_IOS_XCODE_DLL}")
 endif()
 
 # Dont pack libraries shipped with unity
 unity_pack_skip(unity_editor_cs)
 unity_pack_skip(unity_engine_cs)
-if(APPLE)
+if(FIREBASE_IOS_BUILD)
   unity_pack_skip(unity_ios_extensions_xcode_cs)
 endif()