Merge pull request #168 from bugsnag/releases/v1.8.1

Releases/v1.8.1

Author: richardelms

BugsnagPerformance/Assets/BugsnagPerformance/Editor/AddScriptingSymbol.cs

@@ -8,7 +8,7 @@ public class AddScriptingSymbol : MonoBehaviour
 
     private const string DEFINE_SYMBOL = "BUGSNAG_PERFORMANCE";
 
-    private static BuildTargetGroup[] _supportedPlatforms = { BuildTargetGroup.Android, BuildTargetGroup.Standalone, BuildTargetGroup.iOS, BuildTargetGroup.WebGL};
+    private static BuildTargetGroup[] _supportedPlatforms = { BuildTargetGroup.Android, BuildTargetGroup.Standalone, BuildTargetGroup.iOS, BuildTargetGroup.WebGL };
 
     static AddScriptingSymbol()
     {
@@ -27,10 +27,15 @@ static AddScriptingSymbol()
 
     static void SetScriptingSymbol(BuildTargetGroup buildTargetGroup)
     {
-        var existingSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup);
-        if (!existingSymbols.Contains(DEFINE_SYMBOL))
+        var existingSymbols = BugsnagPlayerSettingsCompat.GetScriptingDefineSymbols(buildTargetGroup);
+        if (string.IsNullOrEmpty(existingSymbols))
         {
-            PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup,existingSymbols + ";" + DEFINE_SYMBOL);
+            existingSymbols = DEFINE_SYMBOL;
         }
+        else if (!existingSymbols.Contains(DEFINE_SYMBOL))
+        {
+            existingSymbols += ";" + DEFINE_SYMBOL;
+        }
+        BugsnagPlayerSettingsCompat.SetScriptingDefineSymbols(buildTargetGroup, existingSymbols);
     }
 }

BugsnagPerformance/Assets/BugsnagPerformance/Editor/PlayerSettingsCompat.cs

@@ -0,0 +1,46 @@
+using UnityEditor;
+#if UNITY_2021_2_OR_NEWER
+using UnityEditor.Build;
+#endif
+
+    internal static class BugsnagPlayerSettingsCompat
+    {
+        // Get Scripting Backend
+        public static ScriptingImplementation GetScriptingBackend(BuildTargetGroup buildTargetGroup)
+        {
+#if UNITY_2021_2_OR_NEWER
+            return PlayerSettings.GetScriptingBackend(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup));
+#else
+            return PlayerSettings.GetScriptingBackend(buildTargetGroup);
+#endif
+        }
+
+        public static string GetApplicationIdentifier(BuildTargetGroup buildTargetGroup)
+        {
+#if UNITY_2021_2_OR_NEWER
+            return PlayerSettings.GetApplicationIdentifier(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup));
+#else
+            return PlayerSettings.GetApplicationIdentifier(buildTargetGroup);
+#endif
+        }
+
+        // Get Scripting Define Symbols
+        public static string GetScriptingDefineSymbols(BuildTargetGroup buildTargetGroup)
+        {
+#if UNITY_2021_2_OR_NEWER
+            return PlayerSettings.GetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup));
+#else
+            return PlayerSettings.GetScriptingDefineSymbolsForGroup(buildTargetGroup);
+#endif
+        }
+
+        // Set Scripting Define Symbols
+        public static void SetScriptingDefineSymbols(BuildTargetGroup buildTargetGroup, string defineSymbols)
+        {
+#if UNITY_2021_2_OR_NEWER
+            PlayerSettings.SetScriptingDefineSymbols(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup), defineSymbols);
+#else
+            PlayerSettings.SetScriptingDefineSymbolsForGroup(buildTargetGroup, defineSymbols);
+#endif
+        }
+    }

BugsnagPerformance/Assets/BugsnagPerformance/Editor/PlayerSettingsCompat.cs.meta

@@ -3,6 +3,6 @@
     internal static class Version
     {
         //TODO set this using sed or something in the release automation task
-        public const string VersionString = "1.8.0";
+        public const string VersionString = "1.8.1";
     }
 }

BugsnagPerformance/Assets/BugsnagPerformance/Scripts/Internal/Version.cs

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.8.1 (2025-03-27)
+
+### Bug Fixes
+
+- Fix issue where scripting symbols were not always correctly set in batch mode. [#164](https://github.com/bugsnag/bugsnag-unity-performance/pull/164)
+
 ## v1.8.0 (2025-02-05)
 
 ### Additions

CHANGELOG.md

@@ -57,8 +57,17 @@ def dev_project_path
 end
 
 def build_upm_package
+  version_file_path = File.join("BugsnagPerformance", "Assets", "BugsnagPerformance", "Scripts", "Internal", "Version.cs")
+  version_match = File.read(version_file_path).match(/public const string VersionString = "(\d+\.\d+\.\d+)"/)
+
+  unless version_match
+    raise "Could not extract version from #{version_file_path}"
+  end
+
+  version = version_match[1]
+
   script = File.join("upm", "scripts", "build-upm-package.sh")
-  command = "#{script} 1.2.3"
+  command = "#{script} #{version}"
   unless system command
     raise 'build upm package failed'
   end

Rakefile

@@ -20,7 +20,8 @@ services:
       BUILDKITE_STEP_KEY:
       BITBAR_USERNAME:
       BITBAR_ACCESS_KEY:
-      MAZE_ASPECTO_REPEATER_API_KEY:
+      MAZE_BUGSNAG_API_KEY:
+      MAZE_APPIUM_BUGSNAG_API_KEY:
       MAZE_REPEATER_API_KEY:
       UNITY_VERSION:
       MAZE_NO_FAIL_FAST: