Skip to content

Commit

Permalink
Update tools to use Unity 2021 (#1114)
Browse files Browse the repository at this point in the history
* Update the tools to use Unity 2021

* Update AppBuilderHelper.cs

* Update AppBuilderHelper.cs

* Update some of the testapps to 2021

* Update build_testapps to use ndk r21

* Use default Android settings for test builds

* Update remaining testapps to use 2021

* Fix for Linux log failure

* Add debug logs

* Use Java 11

* Add more logs

* More logs

* More logs

* Update XcodeCapabilities to use ProjectCapabilityManager

* Ignore Linux debug files, and remove logs

* Cleanup new entitlements logic

* Update desktop_tester.py

* Clean up comments
  • Loading branch information
a-maurice authored Sep 26, 2024
1 parent 919e11a commit 4e5201e
Show file tree
Hide file tree
Showing 45 changed files with 7,105 additions and 2,911 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2019'
default: '2021'
required: true
type: string
firebase_cpp_sdk_version:
Expand Down Expand Up @@ -96,9 +96,9 @@ jobs:
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e" >> $GITHUB_ENV
brew install swig
- name: Force Java 8 (macOS)
- name: Force Java 11
shell: bash
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
run: echo "JAVA_HOME=${JAVA_HOME_11_X64}" >> $GITHUB_ENV

- name: Install python deps
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2019'
default: '2021'
required: true
type: string
firebase_cpp_sdk_version:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2019'
default: '2021'
required: true
type: string
firebase_cpp_sdk_version:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2019'
default: '2021'
required: true
type: string
firebase_cpp_sdk_version:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_starter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2020'
default: '2021'
required: true
firebase_cpp_sdk_version:
description: 'Firebase CPP SDK version to build against (The branch, tag or SHA to checkout). Required if for release'
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
echo "release_label=nightly-$(date "+%Y%m%d-%H%M%S")" >> $GITHUB_OUTPUT
echo "release_version=NoVersion" >> $GITHUB_OUTPUT
echo "apis='analytics,app_check,auth,crashlytics,database,dynamic_links,firestore,functions,installations,messaging,remote_config,storage'" >> $GITHUB_OUTPUT
echo "unity_version=2020" >> $GITHUB_OUTPUT
echo "unity_version=2021" >> $GITHUB_OUTPUT
echo "should_trigger_package=true" >> $GITHUB_OUTPUT
echo "firebase_cpp_sdk_version=" >> $GITHUB_OUTPUT
echo "unity_branch=" >> $GITHUB_OUTPUT
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_tvos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2019'
default: '2021'
required: true
type: string
firebase_cpp_sdk_version:
Expand All @@ -33,7 +33,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2019'
default: '2021'
required: true
type: string
firebase_cpp_sdk_version:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2019'
default: '2021'
required: true
type: string
firebase_cpp_sdk_version:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_swig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
inputs:
unity_version:
description: 'Unity version'
default: '2020'
default: '2021'
required: true
type: string
firebase_cpp_sdk_version:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
packaged_sdk_run_id:
description: 'run # of "Firebase Unity SDK build" workflow. (If Leave it empty, the latest released Unity SDK will be used.)'
unity_versions:
description: 'Unity version (value: 2018, 2019, 2020. separated by commas)'
default: '2020'
description: 'Unity version (value: 2021, 2022. separated by commas)'
default: '2021'
required: true
build_os:
description: 'Build OS (value: windows-latest, macos-latest. Left empty will use macos-latest for iOS platform, windows-latest for the rest)'
Expand Down
Loading

0 comments on commit 4e5201e

Please sign in to comment.