From 5377b21799264808365cfd1908599a012730effd Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Mon, 24 Mar 2025 14:56:41 -0300 Subject: [PATCH 1/7] Update obsolete workflow action versions --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fd4d9c0d..7c3da025 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: flutter_version: ["3.10.2"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-java@v1 with: java-version: "11.x" @@ -22,7 +22,7 @@ jobs: with: flutter-version: ${{ matrix.flutter_version }} - name: Cache Dart and Gradle packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -69,7 +69,7 @@ jobs: - name: Build rollbar_flutter Android example working-directory: ./rollbar_flutter/example/ run: flutter build apk - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ always() }} # We are not supposed to lock our dependencies in packages or plugins, so we'll # at least keep track of which ones were used in the build, in case a test fails @@ -90,12 +90,12 @@ jobs: flutter_version: ["3.10.2"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: subosito/flutter-action@4389e6cbc6cb8a4b18c628ff96ff90be0e926aa8 with: flutter-version: ${{ matrix.flutter_version }} - name: Cache pub packages - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ${{ env.PUB_CACHE }} @@ -109,7 +109,7 @@ jobs: - name: Build rollbar_flutter iOS example working-directory: ./rollbar_flutter/example/ run: flutter build ios --no-codesign - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ always() }} # Save dependencies used with: From a61f6817247d37ca7b4c8c26608b7327e78f90df Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Mon, 24 Mar 2025 15:28:40 -0300 Subject: [PATCH 2/7] Updated minimum required ios version of the example to 14 --- rollbar_flutter/example/ios/Flutter/AppFrameworkInfo.plist | 2 +- rollbar_flutter/example/ios/Podfile | 2 +- .../example/ios/Runner.xcodeproj/project.pbxproj | 6 +++--- rollbar_flutter/ios/rollbar_flutter.podspec | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rollbar_flutter/example/ios/Flutter/AppFrameworkInfo.plist b/rollbar_flutter/example/ios/Flutter/AppFrameworkInfo.plist index 9625e105..163000d8 100644 --- a/rollbar_flutter/example/ios/Flutter/AppFrameworkInfo.plist +++ b/rollbar_flutter/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 14.0 diff --git a/rollbar_flutter/example/ios/Podfile b/rollbar_flutter/example/ios/Podfile index 5c4ba946..882f8908 100644 --- a/rollbar_flutter/example/ios/Podfile +++ b/rollbar_flutter/example/ios/Podfile @@ -1,4 +1,4 @@ -platform :ios, '11.0' +platform :ios, '14.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/rollbar_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/rollbar_flutter/example/ios/Runner.xcodeproj/project.pbxproj index f655eaf1..0fc33a9d 100644 --- a/rollbar_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/rollbar_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -353,7 +353,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -429,7 +429,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -478,7 +478,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/rollbar_flutter/ios/rollbar_flutter.podspec b/rollbar_flutter/ios/rollbar_flutter.podspec index 27cc2199..af1d453e 100644 --- a/rollbar_flutter/ios/rollbar_flutter.podspec +++ b/rollbar_flutter/ios/rollbar_flutter.podspec @@ -18,7 +18,7 @@ Connect your Flutter applications to Rollbar for error reporting. s.dependency 'Flutter' s.dependency 'RollbarNotifier', '~> 3.3.3' s.static_framework = true - s.platform = :ios, '11.0' + s.platform = :ios, '14.0' # Flutter.framework does not contain a i386 slice. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', From 4130ac67d042e3c493554153f5cf5ef392bbb2fb Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Mon, 24 Mar 2025 15:44:35 -0300 Subject: [PATCH 3/7] Update flutter version used by the CI to the latest --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c3da025..b5626a1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: name: Flutter version ${{ matrix.flutter_version }} (Android) strategy: matrix: - flutter_version: ["3.10.2"] + flutter_version: ["3.29.2"] steps: - uses: actions/checkout@v4 @@ -87,7 +87,7 @@ jobs: name: Flutter version ${{ matrix.flutter_version }} (iOS) strategy: matrix: - flutter_version: ["3.10.2"] + flutter_version: ["3.29.2"] steps: - uses: actions/checkout@v4 From ade6acba5b12e7b4160d057baceffc576459844e Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Mon, 24 Mar 2025 15:50:19 -0300 Subject: [PATCH 4/7] unsafe_html was removed in Dart 3.7.0 --- rollbar_dart/analysis_options.yaml | 2 -- rollbar_flutter/analysis_options.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/rollbar_dart/analysis_options.yaml b/rollbar_dart/analysis_options.yaml index e7158cc4..073028ba 100644 --- a/rollbar_dart/analysis_options.yaml +++ b/rollbar_dart/analysis_options.yaml @@ -17,8 +17,6 @@ linter: - prefer_single_quotes - sort_child_properties_last - unawaited_futures - - unsafe_html - # For more information about the core and recommended set of lints, see # https://dart.dev/go/core-lints diff --git a/rollbar_flutter/analysis_options.yaml b/rollbar_flutter/analysis_options.yaml index 8977ff0b..b3ecb53c 100644 --- a/rollbar_flutter/analysis_options.yaml +++ b/rollbar_flutter/analysis_options.yaml @@ -18,7 +18,5 @@ linter: - always_declare_return_types - prefer_single_quotes - unawaited_futures - - unsafe_html - # Additional information about this file can be found at # https://dart.dev/guides/language/analysis-options From 70d0c5144f8cb7ea1f364b95b705e170b2006c10 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Mon, 24 Mar 2025 15:51:14 -0300 Subject: [PATCH 5/7] Fix The value of 'identity' should be used --- rollbar_flutter/lib/src/platform_transformer.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollbar_flutter/lib/src/platform_transformer.dart b/rollbar_flutter/lib/src/platform_transformer.dart index 0c860d96..0b9e0810 100644 --- a/rollbar_flutter/lib/src/platform_transformer.dart +++ b/rollbar_flutter/lib/src/platform_transformer.dart @@ -61,7 +61,7 @@ extension _Message on Iterable { (extraTraces.tryFirst?.exception.message) .map((message) => 'PlatformException(error, "$message")') .map(replaceExceptionMessages) - .map(append ? extraTraces.followedBy : identity) + .map(append ? extraTraces.followedBy : (x) => x) .or(this); /// Propagates the given [message] as the new exception message, replacing From 132cd9571727ed6b38f337c48af2e01b7d34ab98 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Mon, 24 Mar 2025 15:53:42 -0300 Subject: [PATCH 6/7] Fix workflow upload artifact conflict --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5626a1f..9b5a551b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: # at least keep track of which ones were used in the build, in case a test fails # and we need to reproduce it locally with the same dependencies. with: - name: dependencies_used_${{ matrix.flutter_version }} + name: dependencies_used_${{ runner.os }}_${{ matrix.flutter_version }}_${{ github.run_id }} path: | rollbar_dart/pubspec.lock rollbar_dart/example/pubspec.lock @@ -113,7 +113,7 @@ jobs: if: ${{ always() }} # Save dependencies used with: - name: dependencies_used_${{ matrix.flutter_version }} + name: dependencies_used_${{ runner.os }}_${{ matrix.flutter_version }}_${{ github.run_id }} path: | rollbar_dart/pubspec.lock rollbar_dart/example/pubspec.lock From fc15532b6ee41ac89fd5c3d37903a3b835fa8096 Mon Sep 17 00:00:00 2001 From: Matias Pequeno Date: Mon, 24 Mar 2025 15:53:53 -0300 Subject: [PATCH 7/7] Use the latest flutter action in workflow --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b5a551b..ca575026 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-java@v1 with: java-version: "11.x" - - uses: subosito/flutter-action@4389e6cbc6cb8a4b18c628ff96ff90be0e926aa8 + - uses: subosito/flutter-action@v2 with: flutter-version: ${{ matrix.flutter_version }} - name: Cache Dart and Gradle packages @@ -91,7 +91,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: subosito/flutter-action@4389e6cbc6cb8a4b18c628ff96ff90be0e926aa8 + - uses: subosito/flutter-action@v2 with: flutter-version: ${{ matrix.flutter_version }} - name: Cache pub packages