Merge pull request #930 from bugsnag/releases/v8.7.1

richardelms · web-flow · commit e6ab980e7f60 · 2025-09-08T12:58:13.000+02:00
Release v8.7.1
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -15,7 +15,7 @@ steps:
     retry:
       automatic:
         - exit_status: "*"
-          limit: 1
+          limit: 3
 
   - label: Run Unit Tests
     timeout_in_minutes: 5
diff --git a/.buildkite/unity.2020.yml b/.buildkite/unity.2020.yml
@@ -119,138 +119,3 @@ steps:
           automatic:
             - exit_status: "*"
               limit: 1
-
-  - group: ":test_tube: E2E tests Unity 2020"
-    steps:
-      - label: ":bitbar: :android: Run Android e2e tests for Unity 2020"
-        timeout_in_minutes: 60
-        depends_on: "build-android-fixture-2020"
-        agents:
-          queue: opensource
-        env:
-          UNITY_VERSION: *2020
-        plugins:
-          artifacts#v1.9.0:
-            download:
-              - "features/fixtures/maze_runner/mazerunner_2020.apk"
-            upload:
-              - "maze_output/**/*"
-              - "maze_output/metrics.csv"
-          docker-compose#v4.7.0:
-            pull: maze-runner-bitbar
-            run: maze-runner-bitbar
-            service-ports: true
-            command:
-              - "features/csharp"
-              - "features/android"
-              - "--app=features/fixtures/maze_runner/mazerunner_2020.apk"
-              - "--farm=bb"
-              - "--appium-version=1.22"
-              - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
-              - "--no-tunnel"
-              - "--aws-public-ip"
-              - "--fail-fast"
-          test-collector#v1.10.2:
-            files: "reports/TEST-*.xml"
-            format: "junit"
-            branch: "^master|next$$"
-        concurrency: 25
-        concurrency_group: "bitbar"
-        concurrency_method: eager
-
-      - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2020"
-        timeout_in_minutes: 60
-        depends_on: "build-ios-fixture-2020"
-        agents:
-          queue: opensource
-        env:
-          UNITY_VERSION: *2020
-        plugins:
-          artifacts#v1.9.0:
-            download:
-              - "features/fixtures/maze_runner/mazerunner_2020.ipa"
-            upload:
-              - "maze_output/**/*"
-              - "maze_output/metrics.csv"
-          docker-compose#v4.7.0:
-            pull: maze-runner-bitbar
-            run: maze-runner-bitbar
-            service-ports: true
-            command:
-              - "features/csharp"
-              - "features/ios"
-              - "--app=features/fixtures/maze_runner/mazerunner_2020.ipa"
-              - "--farm=bb"
-              - "--appium-version=1.22"
-              - "--device=IOS_13|IOS_14|IOS_15"
-              - "--no-tunnel"
-              - "--aws-public-ip"
-              - "--fail-fast"
-          test-collector#v1.10.2:
-            files: "reports/TEST-*.xml"
-            format: "junit"
-            branch: "^master|next$$"
-        concurrency: 25
-        concurrency_group: "bitbar"
-        concurrency_method: eager
-
-      - label: Run MacOS e2e tests for Unity 2020
-        agents:
-          queue: macos-15-isolated
-        timeout_in_minutes: 60
-        depends_on: "macos-2020-fixture"
-        env:
-          UNITY_VERSION: *2020
-        plugins:
-          artifacts#v1.9.0:
-            download:
-              - features/fixtures/maze_runner/build/MacOS-release-2020.zip
-            upload:
-              - maze_output/**/*
-              - '*-mazerunner.log'
-              - maze_output/metrics.csv
-          test-collector#v1.10.2:
-            files: "reports/TEST-*.xml"
-            format: "junit"
-            branch: "^master|next$$"
-        commands:
-          - scripts/ci-run-macos-tests.sh release
-
-      - label: Run WebGL e2e tests for Unity 2020
-        agents:
-          queue: macos-15-isolated
-        timeout_in_minutes: 30
-        depends_on: "webgl-2020-fixture"
-        env:
-          UNITY_VERSION: *2020
-        plugins:
-          artifacts#v1.9.0:
-            download:
-              - features/fixtures/maze_runner/build/WebGL-release-2020.zip
-            upload:
-              - maze_output/**/*
-              - maze_output/metrics.csv
-          test-collector#v1.10.2:
-            files: "reports/TEST-*.xml"
-            format: "junit"
-            branch: "^master|next$$"
-        # TODO: WebGL persistence tests are currently skipped pending PLAT-8151
-        commands:
-          - scripts/ci-run-webgl-tests.sh release
-
-      - label: Run Windows e2e tests for Unity 2020
-        timeout_in_minutes: 30
-        depends_on: "windows-2020-fixture"
-        agents:
-          queue: windows-general-isolated
-        env:
-          UNITY_VERSION: *2020
-        plugins:
-          artifacts#v1.9.0:
-            download:
-              - features/fixtures/maze_runner/build/Windows-release-2020.zip
-            upload:
-              - maze_output/**/*
-              - maze_output/metrics.csv
-        command:
-          - scripts/ci-run-windows-tests-wsl.sh release
diff --git a/.buildkite/unity.2021.full.yml b/.buildkite/unity.2021.full.yml
@@ -252,6 +252,10 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
 
       - label: ":bitbar: :android: Run Android edm4u e2e tests for Unity 2021"
         timeout_in_minutes: 60
@@ -286,6 +290,10 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
 
       - label: ":bitbar: :ios: Run iOS e2e DEV tests for Unity 2021"
         timeout_in_minutes: 60
@@ -320,6 +328,10 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
 
       - label: Run MacOS e2e tests for Unity 2021
         agents:
diff --git a/.buildkite/unity.2021.yml b/.buildkite/unity.2021.yml
@@ -86,6 +86,10 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
 
       - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2021"
         timeout_in_minutes: 60
@@ -121,3 +125,7 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
diff --git a/.buildkite/unity.2022.yml b/.buildkite/unity.2022.yml
@@ -149,6 +149,10 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
 
       - label: ":bitbar: :ios: Run iOS e2e tests for Unity 2022"
         timeout_in_minutes: 60
@@ -183,6 +187,10 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
 
       - label: Run MacOS e2e tests for Unity 2022
         timeout_in_minutes: 60
diff --git a/.buildkite/unity.6000.yml b/.buildkite/unity.6000.yml
@@ -152,6 +152,10 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
 
       - label: ":bitbar: :ios: Run iOS e2e tests for Unity 6000"
         timeout_in_minutes: 60
@@ -186,6 +190,10 @@ steps:
         concurrency: 25
         concurrency_group: "bitbar"
         concurrency_method: eager
+        retry:
+          automatic:
+            - exit_status: 103  # Appium session failed
+              limit: 2
 
       - label: Run MacOS e2e tests for Unity 6000
         timeout_in_minutes: 60
diff --git a/Bugsnag/Assets/Bugsnag/Editor/BuildPreprocessor.cs b/Bugsnag/Assets/Bugsnag/Editor/BuildPreprocessor.cs
@@ -17,11 +17,15 @@ public void OnPreprocessBuild(BuildReport report)
             // Causes il2cpp to generate my-build-dir/Classes/Native/Symbols/LineNumberMappings.json
             // Note: It used to be stored in the project root dir as:
             //   my-build-dir_BackUpThisFolder_ButDontShipItWithYourGame/il2cppOutput/Symbols/LineNumberMappings.json
-            const string emitIl2cppSourceMapping = "--emit-source-mapping";
-            var args = PlayerSettings.GetAdditionalIl2CppArgs();
-            if (!args.Contains(emitIl2cppSourceMapping))
+            const string emit = "--emit-source-mapping";
+            var args = (PlayerSettings.GetAdditionalIl2CppArgs() ?? string.Empty).Trim();
+
+            // token-aware check: flag present as a standalone token?
+            var hasToken = System.Text.RegularExpressions.Regex.IsMatch(args, @"(?<!\S)--emit-source-mapping(?!\S)");
+            if (!hasToken)
             {
-                PlayerSettings.SetAdditionalIl2CppArgs(args + emitIl2cppSourceMapping);
+                var updated = string.IsNullOrEmpty(args) ? emit : $"{args} {emit}";
+                PlayerSettings.SetAdditionalIl2CppArgs(updated);
             }
         }
     }
diff --git a/Bugsnag/Assets/Bugsnag/Runtime/AssemblyInfo.cs b/Bugsnag/Assets/Bugsnag/Runtime/AssemblyInfo.cs
@@ -1,2 +1,2 @@
 using System.Reflection;
-[assembly: AssemblyVersion("8.7.0.0")]
+[assembly: AssemblyVersion("8.7.1.0")]
diff --git a/Bugsnag/ProjectSettings/ProjectSettings.asset b/Bugsnag/ProjectSettings/ProjectSettings.asset
@@ -249,7 +249,7 @@ PlayerSettings:
   useCustomGradlePropertiesTemplate: 0
   useCustomGradleSettingsTemplate: 0
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 3
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -772,7 +772,8 @@ PlayerSettings:
     iPhone: BUGSNAG_UNITY_WEB_REQUEST
   additionalCompilerArguments: {}
   platformArchitecture: {}
-  scriptingBackend: {}
+  scriptingBackend:
+    Android: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel:
     EmbeddedLinux: 1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.7.1 (2025-09-08)
+
+- Fix an issue where additional IL2CPP arguments were added without proper whitespace checks [#928](https://github.com/bugsnag/bugsnag-unity/pull/928)
+
 ## 8.7.0 (2025-08-28)
 
 ### Enhancements
diff --git a/features/fixtures/maze_runner/Assets/Scripts/Main.cs b/features/fixtures/maze_runner/Assets/Scripts/Main.cs
@@ -49,7 +49,7 @@ public IEnumerator Start()
 #if UNITY_STANDALONE_OSX
         PreventCrashPopups();
 #endif
-        InvokeRepeating("DoRunNextMazeCommand",0,1);
+        InvokeRepeating("DoRunNextMazeCommand", 0, 1);
     }
 
     private IEnumerator GetFixtureConfig()
@@ -122,7 +122,7 @@ IEnumerator RunNextMazeCommand()
                     Log("No Maze Runner command to process at present");
                 }
                 else
-                { 
+                {
                     var command = JsonUtility.FromJson<Command>(response);
                     if (command != null)
                     {
@@ -161,7 +161,7 @@ private void ClearUnityCache()
 #endif
         if (Directory.Exists(Application.persistentDataPath + "/Bugsnag"))
         {
-            Directory.Delete(Application.persistentDataPath + "/Bugsnag",true);
+            Directory.Delete(Application.persistentDataPath + "/Bugsnag", true);
         }
         if (Application.platform == RuntimePlatform.IPhonePlayer)
         {
@@ -183,10 +183,16 @@ public static void ClearIOSData()
 
     private static void Log(string msg)
     {
-        Logger.I(msg);
-    }
-
-}
+        try
+        {
+            Logger.I(msg);
+        }
+        catch
+        {
+            // can fail on windows
+        }
 
+    }
 
 
+}

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,15 @@ public void OnPreprocessBuild(BuildReport report)`
`17`	`17`	`// Causes il2cpp to generate my-build-dir/Classes/Native/Symbols/LineNumberMappings.json`
`18`	`18`	`// Note: It used to be stored in the project root dir as:`
`19`	`19`	`// my-build-dir_BackUpThisFolder_ButDontShipItWithYourGame/il2cppOutput/Symbols/LineNumberMappings.json`
`20`		`- const string emitIl2cppSourceMapping = "--emit-source-mapping";`
`21`		`- var args = PlayerSettings.GetAdditionalIl2CppArgs();`
`22`		`- if (!args.Contains(emitIl2cppSourceMapping))`
	`20`	`+ const string emit = "--emit-source-mapping";`
	`21`	`+ var args = (PlayerSettings.GetAdditionalIl2CppArgs() ?? string.Empty).Trim();`
	`22`	`+`
	`23`	`+ // token-aware check: flag present as a standalone token?`
	`24`	`+ var hasToken = System.Text.RegularExpressions.Regex.IsMatch(args, @"(?<!\S)--emit-source-mapping(?!\S)");`
	`25`	`+ if (!hasToken)`
`23`	`26`	`{`
`24`		`- PlayerSettings.SetAdditionalIl2CppArgs(args + emitIl2cppSourceMapping);`
	`27`	`+ var updated = string.IsNullOrEmpty(args) ? emit : $"{args} {emit}";`
	`28`	`+ PlayerSettings.SetAdditionalIl2CppArgs(updated);`
`25`	`29`	`}`
`26`	`30`	`}`
`27`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-[assembly: AssemblyVersion("8.7.0.0")]`
	`2`	`+[assembly: AssemblyVersion("8.7.1.0")]`