Merge pull request #765 from bugsnag/backport-release-6_3_5

Backport Release v6.3.5

Author: richardelms

.buildkite/pipeline.full.yml

@@ -10,7 +10,7 @@ steps:
     timeout_in_minutes: 30
     key: 'build-artifacts'
     env:
-      UNITY_VERSION: "2018.4.36f1"
+      UNITY_VERSION: "2020.3.48f1"
     commands:
       - bundle install
       - bundle exec rake plugin:export
@@ -21,72 +21,6 @@ steps:
         - exit_status: "*"
           limit: 1
 
-  #
-  # Build MacOS and WebGL test fixtures
-  #
-  - label: Build Unity 2020 MacOS and WebGL test fixtures
-    timeout_in_minutes: 30
-    key: 'cocoa-webgl-2020-fixtures'
-    depends_on: 'build-artifacts'
-    env:
-      UNITY_VERSION: "2020.3.32f1"
-    plugins:
-      artifacts#v1.5.0:
-        download:
-          - Bugsnag.unitypackage
-    commands:
-      - scripts/ci-build-macos-packages.sh
-    artifact_paths:
-      - unity.log
-      - features/fixtures/maze_runner/build/MacOS-2020.3.32f1.zip
-      - features/fixtures/maze_runner/build/WebGL-2020.3.32f1.zip
-    retry:
-      automatic:
-        - exit_status: "*"
-          limit: 1
-
-  #
-  # Run desktop tests
-  #
-  - label: Run MacOS e2e tests for Unity 2020
-    timeout_in_minutes: 30
-    depends_on: 'cocoa-webgl-2020-fixtures'
-    agents:
-      queue: macos-12-arm-unity
-    env:
-      UNITY_VERSION: "2020.3.32f1"
-    plugins:
-      artifacts#v1.5.0:
-        download:
-          - features/fixtures/maze_runner/build/MacOS-2020.3.32f1.zip
-        upload:
-          - maze_output/**/*
-          - Mazerunner.log
-    commands:
-      - scripts/ci-run-macos-tests.sh
-
-  #
-  # Run WebGL tests
-  #
-  # Note: These are run on Intel due to an issue with persistence with Firefox on ARM.
-  #
-  - label: Run WebGL e2e tests for Unity 2020
-    timeout_in_minutes: 30
-    depends_on: 'cocoa-webgl-2020-fixtures'
-    agents:
-      queue: opensource-mac-cocoa-11
-    env:
-      UNITY_VERSION: "2020.3.32f1"
-    plugins:
-      artifacts#v1.5.0:
-        download:
-          - features/fixtures/maze_runner/build/WebGL-2020.3.32f1.zip
-        upload:
-          - maze_output/**/*
-    # TODO: WebGL persistence tests are currently skipped pending PLAT-8151
-    commands:
-      - scripts/ci-run-webgl-tests.sh
-
   #
   # Build Android test fixtures
   #
@@ -95,13 +29,13 @@ steps:
     key: 'build-android-fixture-2020'
     depends_on: 'build-artifacts'
     env:
-      UNITY_VERSION: "2020.3.32f1"
+      UNITY_VERSION: "2020.3.48f1"
     plugins:
       artifacts#v1.5.0:
         download:
           - Bugsnag.unitypackage
         upload:
-          - features/fixtures/maze_runner/mazerunner_2020.3.32f1.apk
+          - features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk
           - features/fixtures/unity.log
     commands:
       - rake test:android:build
@@ -110,28 +44,6 @@ steps:
         - exit_status: "*"
           limit: 1
 
-  - label: ':android: Build Android EDM test fixture for Unity 2020'
-    timeout_in_minutes: 30
-    key: 'build-edm-fixture-2020'
-    depends_on: 'build-artifacts'
-    env:
-      UNITY_VERSION: "2020.3.32f1"
-    plugins:
-      artifacts#v1.5.0:
-        download:
-          - Bugsnag.unitypackage
-        upload:
-          - features/fixtures/EDM_Fixture/edm_2020.3.32f1.apk
-          - features/scripts/mobile/buildEdmFixture.log
-          - features/scripts/mobile/edmImport.log
-          - features/scripts/mobile/enableEdm.log
-    commands:
-      - rake test:edm:build
-    retry:
-      automatic:
-        - exit_status: "*"
-          limit: 1
-
   #
   # Run Android tests
   #
@@ -141,49 +53,25 @@ steps:
     agents:
       queue: opensource
     env:
-      UNITY_VERSION: "2020.3.32f1"
+      UNITY_VERSION: "2020.3.48f1"
     plugins:
       artifacts#v1.5.0:
         download:
-          - "features/fixtures/maze_runner/mazerunner_2020.3.32f1.apk"
+          - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk"
         upload:
           - "maze_output/**/*"
       docker-compose#v3.7.0:
         pull: maze-runner
         run: maze-runner
         command:
-          - "--app=/app/features/fixtures/maze_runner/mazerunner_2020.3.32f1.apk"
+          - "--app=/app/features/fixtures/maze_runner/mazerunner_2020.3.48f1.apk"
           - "--farm=bs"
           - "--device=ANDROID_9_0"
           - "features/android"
     concurrency: 9
     concurrency_group: browserstack-app
     concurrency_method: eager
 
-  - label: ':android: Run Android EDM e2e tests for Unity 2020'
-    timeout_in_minutes: 30
-    depends_on: 'build-edm-fixture-2020'
-    agents:
-      queue: opensource
-    env:
-      UNITY_VERSION: "2020.3.32f1"
-    plugins:
-      artifacts#v1.5.0:
-        download:
-          - "features/fixtures/EDM_Fixture/edm_2020.3.32f1.apk"
-        upload:
-          - "maze_output/**/*"
-      docker-compose#v3.7.0:
-        pull: maze-runner
-        run: maze-runner
-        command:
-          - "--app=/app/features/fixtures/EDM_Fixture/edm_2020.3.32f1.apk"
-          - "--farm=bs"
-          - "--device=ANDROID_9_0"
-          - "features/edm"
-    concurrency: 9
-    concurrency_group: browserstack-app
-    concurrency_method: eager
 
   #
   # Build iOS test fixtures
@@ -193,7 +81,7 @@ steps:
     key: 'generate-fixture-project-2020'
     depends_on: 'build-artifacts'
     env:
-      UNITY_VERSION: "2020.3.32f1"
+      UNITY_VERSION: "2020.3.48f1"
     plugins:
       artifacts#v1.5.0:
         download:
@@ -214,14 +102,14 @@ steps:
     key: 'build-ios-fixture-2020'
     depends_on: 'generate-fixture-project-2020'
     env:
-      UNITY_VERSION: "2020.3.32f1"
+      UNITY_VERSION: "2020.3.48f1"
     plugins:
       artifacts#v1.5.0:
         download:
           - Bugsnag.unitypackage
           - project_2020.tgz
         upload:
-          - features/fixtures/maze_runner/mazerunner_2020.3.32f1.ipa
+          - features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa
           - features/fixtures/unity.log
     commands:
       - tar -zxf project_2020.tgz features/fixtures/maze_runner
@@ -242,14 +130,14 @@ steps:
     plugins:
       artifacts#v1.5.0:
         download:
-          - "features/fixtures/maze_runner/mazerunner_2020.3.32f1.ipa"
+          - "features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa"
         upload:
           - "maze_output/**/*"
       docker-compose#v3.7.0:
         pull: maze-runner
         run: maze-runner
         command:
-          - "--app=/app/features/fixtures/maze_runner/mazerunner_2020.3.32f1.ipa"
+          - "--app=/app/features/fixtures/maze_runner/mazerunner_2020.3.48f1.ipa"
           - "--farm=bs"
           - "--device=IOS_14"
           - "--fail-fast"
@@ -258,47 +146,9 @@ steps:
     concurrency_group: browserstack-app
     concurrency_method: eager
 
-  #
-  # Build Windows test fixture
-  #
-  - label: Build Unity 2020 Windows test fixture
-    timeout_in_minutes: 30
-    key: 'windows-2020-fixture'
-    depends_on: 'build-artifacts'
-    agents:
-      queue: opensource-windows-unity
-    env:
-      UNITY_VERSION: "2020.3.32f1"
-    commands:
-      - scripts/ci-build-windows-package.bat
-    artifact_paths:
-      - unity.log
-      - features/fixtures/maze_runner/build/Windows-2020.3.32f1.zip
-    retry:
-      automatic:
-        - exit_status: "*"
-          limit: 1
-
-  #
-  # Run Windows e2e tests
-  #
-  - label: Run Windows e2e tests for Unity 2020
-    timeout_in_minutes: 30
-    depends_on: 'windows-2020-fixture'
-    agents:
-      queue: opensource-windows-unity
-    env:
-      UNITY_VERSION: "2020.3.32f1"
-      WSLENV: "UNITY_VERSION"
-    command:
-      - scripts/ci-run-windows-tests.bat
-    artifact_paths:
-      - maze_output/**/*
-
   #
   # Conditionally trigger full pipeline
   #
   - label: 'Conditionally trigger full set of tests'
     timeout_in_minutes: 30
     command: sh -c .buildkite/pipeline_trigger.sh
-

.buildkite/pipeline.yml

@@ -1,5 +1,8 @@
 # Changelog
 
+## 6.3.5 (2023-07-06)
+
+- Update bugsnag-cocoa from v6.16.1 to [v6.28.0](https://github.com/bugsnag/bugsnag-cocoa/blob/master/CHANGELOG.md#6280-2023-12-13) (includes compliance with Apple's Required Reasons API  – see [online docs](https://docs.bugsnag.com/platforms/ios/appstore-privacy/#declaring-required-reasons-for-api-usage))
 
 ## 6.3.4 (2023-07-06)
 

CHANGELOG.md

@@ -5,7 +5,7 @@ gem 'xcpretty'
 gem 'xcodeproj'
 
 # Use official Maze Runner release
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.27.0'
+gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v8.15.0'
 
 # Use a specific Maze Runner branch
 #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'master'

Gemfile

@@ -194,7 +194,7 @@ namespace :plugin do
           # Define TARGET_OS* macros since they aren't added for static targets.
           case project_name
           when "bugsnag-tvos"
-            target = project.new_target(:static_library, "bugsnag-tvos", :tvos, "9.0")
+            target = project.new_target(:static_library, "bugsnag-tvos", :tvos, "9.2")
             target_macro = "-DTARGET_OS_TV"
 
             # Link UIKit during compilation
@@ -203,7 +203,7 @@ namespace :plugin do
               phase.add_file_reference file_ref
             end
           when "bugsnag-ios"
-            target = project.new_target(:static_library, "bugsnag-ios", :ios, "8.0")
+            target = project.new_target(:static_library, "bugsnag-ios", :ios, "9.0")
             target_macro = "-DTARGET_OS_IPHONE"
 
             # Link UIKit during compilation
@@ -212,7 +212,7 @@ namespace :plugin do
               phase.add_file_reference file_ref
             end
           when "bugsnag-osx"
-            target = project.new_target(:bundle, "bugsnag-osx", :osx, "10.8")
+            target = project.new_target(:bundle, "bugsnag-osx", :osx, "10.11")
             target_macro = "-DTARGET_OS_MAC"
           end
 
@@ -231,9 +231,12 @@ namespace :plugin do
 
           project.build_configurations.each do |build_configuration|
             build_configuration.build_settings["HEADER_SEARCH_PATHS"] = " $(SRCROOT)/Bugsnag/include/"
+
+            build_configuration.build_settings["GENERATE_INFOPLIST_FILE"] = "YES"
+
             if ["bugsnag-ios", "bugsnag-tvos"].include? project_name
               build_configuration.build_settings["ONLY_ACTIVE_ARCH"] = "NO"
-              build_configuration.build_settings["VALID_ARCHS"] = ["x86_64", "i386", "armv7", "arm64"]
+              build_configuration.build_settings["VALID_ARCHS"] = ["x86_64", "armv7", "arm64"]
             end
             case build_configuration.type
             when :debug
@@ -260,6 +263,9 @@ namespace :plugin do
 
       tvos_dir = File.join(assets_path, "tvOS")
 
+      #copy framework usage api file
+      cp_r File.join("bugsnag-cocoa", "Bugsnag", "resources", "PrivacyInfo.xcprivacy"), ios_dir
+
       cd cocoa_build_dir do
         cd "build" do
           def is_fat library_path
@@ -277,7 +283,6 @@ namespace :plugin do
             device_library = File.join("#{build_type}-#{long_name}os", library)
             simulator_dir = "#{build_type}-#{long_name}simulator"
             simulator_library = File.join(simulator_dir, library)
-            simulator_x86 = File.join(simulator_dir, "libBugsnagStatic-x86.a")
             simulator_x64 = File.join(simulator_dir, "libBugsnagStatic-x64.a")
             output_library = File.join(directory, library)
 
@@ -286,12 +291,9 @@ namespace :plugin do
             else
               simulator_x64 = simulator_library
             end
-            if short_name == "ios"
-              sh "lipo", "-extract", "i386", simulator_library, "-output", simulator_x86
-              sh "lipo", "-create", device_library, simulator_x86, simulator_x64, "-output", output_library
-            else
-              sh "lipo", "-create", device_library, simulator_x64, "-output", output_library
-            end
+       
+            sh "lipo", "-create", device_library, simulator_x64, "-output", output_library
+            
           end
         end
       end
@@ -450,4 +452,4 @@ namespace :test do
     task build: %w[test:ios:generate_xcode test:ios:build_xcode] do
     end
   end
-end
+end

Rakefile

@@ -5,7 +5,7 @@ var target = Argument("target", "Default");
 var solution = File("./BugsnagUnity.sln");
 var configuration = Argument("configuration", "Release");
 var project = File("./src/BugsnagUnity/BugsnagUnity.csproj");
-var version = "6.3.4";
+var version = "6.3.5";
 
 Task("Restore-NuGet-Packages")
     .Does(() => NuGetRestore(solution));

bugsnag-cocoa

@@ -20,7 +20,6 @@ Feature: Callbacks
         And the event "device.model" equals "Model"
         And the event "device.orientation" equals "Orientation"
         And the event "device.manufacturer" equals "Manufacturer"
-        And the event "device.freeDisk" equals 123
         And the event "device.freeMemory" equals 123
         And the event "device.jailbroken" is true
         And the event "device.locale" equals "Locale"

build.cake

@@ -47,7 +47,6 @@ Feature: iOS smoke tests for C# errors
         And the event "device.osVersion" is not null
         And the event "device.runtimeVersions" is not null
 #        And the event "device.totalMemory" is not null
-        And the event "device.freeDisk" is not null
         And the event "device.freeMemory" is not null
 #        And the event "device.orientation" equals "portrait"
         And the event "device.time" is not null