Merge pull request #229 from bugsnag/releases/v3.0.1

Release v3.0.1

.buildkite/pipeline.yml

@@ -41,16 +41,17 @@ steps:
       FLUTTER_BIN: "/opt/flutter/3.10.0/bin/flutter"
     commands:
       - pod repo update trunk
+      - bundle install
       - features/scripts/build_ios_app.sh
     plugins:
       artifacts#v1.5.0:
         upload:
           from: "features/fixtures/app/build/ios/ipa/app.ipa"
           to: "features/fixtures/app/build/ios/ipa/app-3.10.0.ipa"
 
-  - label: 'iOS 14 end-to-end tests 3.10.0'
+  - label: ':bitbar: iOS 14 end-to-end tests 3.10.0'
     depends_on: "ios-fixture-3-10-0"
-    timeout_in_minutes: 10
+    timeout_in_minutes: 20
     env:
       FLUTTER_BIN: "/opt/flutter/3.10.0/bin/flutter"
     agents:
@@ -59,16 +60,19 @@ steps:
       artifacts#v1.5.0:
         download: "features/fixtures/app/build/ios/ipa/app-3.10.0.ipa"
         upload: "maze_output/failed/**/*"
-      docker-compose#v3.7.0:
+      docker-compose#v4.7.0:
         pull: maze-runner
         run: maze-runner
+        service-ports: true
         command:
           - "--app=/app/features/fixtures/app/build/ios/ipa/app-3.10.0.ipa"
-          - "--farm=bs"
-          - "--device=IOS_14"
+          - "--farm=bb"
+          - "--device=IOS_14|IOS_15|IOS_16"
+          - "--no-tunnel"
+          - "--aws-public-ip"
           - "--fail-fast"
-    concurrency: 5
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager
 
   #
@@ -80,16 +84,17 @@ steps:
     env:
       FLUTTER_BIN: "/opt/flutter/3.10.0/bin/flutter"
     commands:
+      - bundle install
       - features/scripts/build_android_app.sh
     plugins:
       artifacts#v1.5.0:
         upload:
           from: "features/fixtures/app/build/app/outputs/flutter-apk/app-release.apk"
           to: "features/fixtures/app/build/app/outputs/flutter-apk/app-release-3.10.0.apk"
 
-  - label: 'Android 12 end-to-end tests 3.10.0'
+  - label: ':bitbar: Android 12 end-to-end tests 3.10.0'
     depends_on: "android-fixture-3-10-0"
-    timeout_in_minutes: 10
+    timeout_in_minutes: 20
     env:
       FLUTTER_BIN: "/opt/flutter/3.10.0/bin/flutter"
     agents:
@@ -98,14 +103,17 @@ steps:
       artifacts#v1.5.0:
         download: "features/fixtures/app/build/app/outputs/flutter-apk/app-release-3.10.0.apk"
         upload: "maze_output/failed/**/*"
-      docker-compose#v3.7.0:
+      docker-compose#v4.7.0:
         pull: maze-runner
         run: maze-runner
+        service-ports: true
         command:
           - "--app=/app/features/fixtures/app/build/app/outputs/flutter-apk/app-release-3.10.0.apk"
-          - "--farm=bs"
-          - "--device=ANDROID_12_0"
+          - "--farm=bb"
+          - "--device=ANDROID_10|ANDROID_11|ANDROID_12|ANDROID_13"
+          - "--no-tunnel"
+          - "--aws-public-ip"
           - "--fail-fast"
-    concurrency: 5
-    concurrency_group: 'browserstack-app'
+    concurrency: 25
+    concurrency_group: 'bitbar'
     concurrency_method: eager

.github/workflows/update-dependencies.yml

@@ -0,0 +1,66 @@
+name: update-dependencies
+
+on:
+  repository_dispatch:
+    types: [update-dependency]
+  workflow_dispatch:
+    inputs:
+      target_submodule:
+        description: 'Submodule to update'
+        required: true
+        type: string
+      target_version:
+        description: 'Version of the submodule to update to'
+        required: true
+        type: string
+
+jobs:
+  update-dependencies:
+    runs-on: macos-latest
+    env:
+      SUBMODULE: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.target_submodule || inputs.target_submodule }}
+      VERSION: ${{ github.event_name == 'repository_dispatch' && github.event.client_payload.target_version || inputs.target_version }}
+      BUNDLE_GITHUB__COM: ${{ secrets.BUNDLE_ACCESS_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: next
+
+      - run: |
+          git config --global user.name 'Bumpsnag bot'
+          git config --global user.email ''
+
+      - run: git fetch --prune --unshallow
+
+      - name: Install libcurl4-openssl-dev and net-tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install libcurl4-openssl-dev net-tools
+
+      - name: Install ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Update references locally
+        run: make update-bugsnag-dependency
+
+      - name: Commit and push changes
+        run: bundle exec bumpsnag commit_update $SUBMODULE $VERSION
+
+      - name: List current branch name
+        id: current-branch
+        run: echo "branch=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_OUTPUT
+
+      - name: Create pull request
+        if: ${{ steps.current-branch.outputs.branch != 'next'}}
+        run: >
+         gh pr create -B next
+         -H bumpsnag-$TARGET_SUBMODULE-$TARGET_VERSION
+         --title "Update $TARGET_SUBMODULE to version $TARGET_VERSION"
+         --body 'Created by bumpsnag'
+         --reviewer kstenerud,robert-smartbear

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.0.1 (2024-01-11)
+
+- Update bugsnag-cocoa from v6.26.2 to [v6.28.0](https://github.com/bugsnag/bugsnag-cocoa/blob/master/CHANGELOG.md#6280-2023-12-13)
+- Update bugsnag-android from v5.30.0 to [v5.31.3](https://github.com/bugsnag/bugsnag-android/blob/master/CHANGELOG.md#5313-2023-11-06)
+
+
 ## 3.0.0 (2023-07-19)
 
 ### Breaking Changes

Gemfile

@@ -2,10 +2,15 @@ source 'https://rubygems.org'
 
 # A reference to Maze Runner is only needed for running tests locally and if committed it must be
 # portable for CI, e.g. a specific release.  However, leaving it commented out would mean quicker CI.
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.14.0'
+gem 'bugsnag-maze-runner', '~> 8.0'
 
 # Use a specific branch
 #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'master'
 
 # Locally, you can run against Maze Runner branches and uncommitted changes:
 #gem 'bugsnag-maze-runner', path: '../maze-runner'
+
+# Only install bumpsnag if we're using Github actions
+unless ENV['GITHUB_ACTIONS'].nil?
+  gem 'bumpsnag', git: 'https://github.com/bugsnag/platforms-bumpsnag', branch: 'main'
+end

Gemfile.lock

@@ -1,36 +1,34 @@
-GIT
-  remote: https://github.com/bugsnag/maze-runner
-  revision: eccc6ceb0b37e4e5f649c21f8ecfaefc8416c26b
-  tag: v6.14.0
+GEM
+  remote: https://rubygems.org/
   specs:
-    bugsnag-maze-runner (6.14.0)
-      appium_lib (~> 11.2.0)
+    appium_lib (12.0.1)
+      appium_lib_core (~> 5.0)
+      nokogiri (~> 1.8, >= 1.8.1)
+      tomlrb (>= 1.1, < 3.0)
+    appium_lib_core (5.4.0)
+      faye-websocket (~> 0.11.0)
+      selenium-webdriver (~> 4.2, < 4.6)
+    bugsnag (6.26.0)
+      concurrent-ruby (~> 1.0)
+    bugsnag-maze-runner (8.2.0)
+      appium_lib (~> 12.0.0)
+      appium_lib_core (~> 5.4.0)
       bugsnag (~> 6.24)
       cucumber (~> 7.1)
       cucumber-expressions (~> 6.0.0)
       curb (~> 0.9.6)
+      dogstatsd-ruby (~> 5.5.0)
+      json_schemer (~> 0.2.24)
       optimist (~> 3.0.1)
       os (~> 1.0.0)
+      rack (~> 2.2)
       rake (~> 12.3.3)
       rubyzip (~> 2.3.2)
-      selenium-webdriver (~> 3.11)
+      selenium-webdriver (~> 4.0)
       test-unit (~> 3.5.2)
       webrick (~> 1.7.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    appium_lib (11.2.0)
-      appium_lib_core (~> 4.1)
-      nokogiri (~> 1.8, >= 1.8.1)
-      tomlrb (~> 1.1)
-    appium_lib_core (4.7.1)
-      faye-websocket (~> 0.11.0)
-      selenium-webdriver (~> 3.14, >= 3.14.1)
-    bugsnag (6.25.2)
-      concurrent-ruby (~> 1.0)
     builder (3.2.4)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     concurrent-ruby (1.2.2)
     cucumber (7.1.0)
       builder (~> 3.2, >= 3.2.4)
@@ -65,11 +63,21 @@ GEM
       cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
     curb (0.9.11)
     diff-lcs (1.5.0)
+    dogstatsd-ruby (5.5.0)
+    ecma-re-validator (0.4.0)
+      regexp_parser (~> 2.2)
     eventmachine (1.2.7)
-    faye-websocket (0.11.2)
+    faye-websocket (0.11.3)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
     ffi (1.15.5)
+    hana (1.3.7)
+    json_schemer (0.2.25)
+      ecma-re-validator (~> 0.3)
+      hana (~> 1.3)
+      regexp_parser (~> 2.0)
+      simpleidn (~> 0.2)
+      uri_template (~> 0.7)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
@@ -80,18 +88,30 @@ GEM
     os (1.0.1)
     power_assert (2.0.3)
     racc (1.7.1)
+    rack (2.2.8)
     rake (12.3.3)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
     rubyzip (2.3.2)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
-      rubyzip (>= 1.2.2)
+    selenium-webdriver (4.5.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
+    simpleidn (0.2.1)
+      unf (~> 0.1.4)
     sys-uname (1.2.3)
       ffi (~> 1.1)
     test-unit (3.5.9)
       power_assert
-    tomlrb (1.3.0)
+    tomlrb (2.0.3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    uri_template (0.7.0)
     webrick (1.7.0)
-    websocket-driver (0.7.5)
+    websocket (1.2.9)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
 
@@ -100,7 +120,7 @@ PLATFORMS
   x86_64-darwin-21
 
 DEPENDENCIES
-  bugsnag-maze-runner!
+  bugsnag-maze-runner (~> 8.0)
 
 BUNDLED WITH
    2.4.8

Makefile

@@ -88,3 +88,27 @@ e2e_ios_local: features/fixtures/app/build/ios/ipa/app.ipa
 
 features/fixtures/app/build/ios/ipa/app.ipa: $(shell find packages/bugsnag_flutter features/fixtures/app/ios/Runner features/fixtures/app/lib -type f)
 	cd features/fixtures/app && $(FLUTTER_BIN) build ipa --export-options-plist=ios/exportOptions.plist
+
+update-bugsnag-android:
+ifeq ($(VERSION),)
+	@$(error VERSION is not defined. Run with `make VERSION=number update-bugsnag-android`)
+endif
+	sed -i '' "s/'com.bugsnag:bugsnag-android:.*'/'com.bugsnag:bugsnag-android:$(VERSION)'/" packages/bugsnag_flutter/android/build.gradle
+
+update-bugsnag-cocoa:
+ifeq ($(VERSION),)
+	@$(error VERSION is not defined. Run with `make VERSION=number update-bugsnag-cocoa`)
+endif
+	sed -i '' "s/s.dependency 'Bugsnag', '.*'/s.dependency 'Bugsnag', '$(VERSION)'/" packages/bugsnag_flutter/ios/bugsnag_flutter.podspec
+
+update-bugsnag-dependency:
+ifeq ($(SUBMODULE),)
+	@$(error SUBMODULE is not defined. Run with `make SUBMODULE=target update-bugsnag-dependency`)
+endif
+ifeq ($(SUBMODULE), bugsnag-android)
+	$(MAKE) update-bugsnag-android
+else ifeq ($(SUBMODULE), bugsnag-cocoa)
+	$(MAKE) update-bugsnag-cocoa
+else
+	@$(error SUBMODULE must be one of bugsnag-android or bugsnag-cocoa)
+endif

docker-compose.yml

@@ -2,26 +2,31 @@ version: '3.6'
 services:
 
   maze-runner:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v6-cli
+    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v8-cli
     environment:
       DEBUG:
+      BITBAR_USERNAME:
+      BITBAR_ACCESS_KEY:
       BUILDKITE:
       BUILDKITE_BRANCH:
       BUILDKITE_BUILD_CREATOR:
       BUILDKITE_BUILD_NUMBER:
       BUILDKITE_BUILD_URL:
+      BUILDKITE_JOB_ID:
       BUILDKITE_LABEL:
       BUILDKITE_MESSAGE:
       BUILDKITE_PIPELINE_NAME:
+      BUILDKITE_PIPELINE_SLUG:
       BUILDKITE_REPO:
       BUILDKITE_RETRY_COUNT:
       BUILDKITE_STEP_KEY:
       MAZE_BUGSNAG_API_KEY:
-      BROWSER_STACK_USERNAME:
-      BROWSER_STACK_ACCESS_KEY:
+    ports:
+      - "9000-9499:9339"
     volumes:
       - ./features/:/app/features/
       - ./maze_output:/app/maze_output
+      - /var/run/docker.sock:/var/run/docker.sock
 
 networks:
   default: