diff --git a/Assets/Plugins/Appboy/AppboyBinding.cs b/Assets/Plugins/Appboy/AppboyBinding.cs index 9229e131..a5e8af45 100755 --- a/Assets/Plugins/Appboy/AppboyBinding.cs +++ b/Assets/Plugins/Appboy/AppboyBinding.cs @@ -832,7 +832,7 @@ public static void LogContentCardClicked(string contentCardString) { public static void LogContentCardDismissed(string contentCardString) { var contentCard = Appboy.Call("deserializeContentCard", contentCardString); - contentCard.Call("setIsDismissed", true); + contentCard.Call("setIsDismissed", true); } public static void LogContentCardsDisplayed() { diff --git a/Assets/Plugins/Appboy/Editor/PostBuild.cs b/Assets/Plugins/Appboy/Editor/PostBuild.cs index 1280f00e..587c3470 100644 --- a/Assets/Plugins/Appboy/Editor/PostBuild.cs +++ b/Assets/Plugins/Appboy/Editor/PostBuild.cs @@ -53,10 +53,17 @@ private static void ModifyProject(string projectPath) { project.RemoveFile(appboyAppDelegateGuid); } else { // Get project targets using Unity's default app target names +#if UNITY_2019_3_OR_NEWER + string[] targets = { + project.GetUnityMainTargetGuid(), + project.TargetGuidByName(PBXProject.GetUnityTestTargetName()) + }; +#else string[] targets = { project.TargetGuidByName(PBXProject.GetUnityTargetName()), project.TargetGuidByName(PBXProject.GetUnityTestTargetName()) }; +#endif string[] requiredFrameworks = { "SystemConfiguration.framework", diff --git a/CHANGELOG.md b/CHANGELOG.md index abfd69d3..c62abf2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.7.1 + +##### Fixed +- Fixed an issue where the return type for the Android implementation of `setIsDismissed` in `AppboyBinding` was incorrectly set to `bool`. +- Removed a deprecated usage of `PBXProject.GetUnityTargetName()`. + ## 2.7.0 ##### Breaking diff --git a/scripts/generate_package.sh b/scripts/generate_package.sh index a5f6a965..87dfb46b 100755 --- a/scripts/generate_package.sh +++ b/scripts/generate_package.sh @@ -6,7 +6,6 @@ PROJECT_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd ) function unity_app_cmd { # Ask MacOS for the path of the currently running Unity process RUNNING_UNITY_APP="$(osascript -e 'tell application "System Events" to POSIX path of (file of process "Unity" as alias)')/Contents/MacOS/Unity" - UNITY_HUB="/Applications/Unity/Hub/Editor/2019.2.20f1/Unity.app/Contents/MacOS/Unity" UNITY_STANDALONE="/Applications/Unity/Unity.app/Contents/MacOS/Unity" if [ -f $RUNNING_UNITY_APP ] @@ -14,11 +13,6 @@ function unity_app_cmd { echo "Using Unity $RUNNING_UNITY_APP" $RUNNING_UNITY_APP "$@" - elif [ -f $UNITY_HUB ] - then - echo "Using Unity $UNITY_HUB" - $UNITY_HUB "$@" - else echo "Using Unity $UNITY_STANDALONE" $UNITY_STANDALONE "$@"