From 597cbde263c2761c75711d863358170d5eb4a62d Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 7 Oct 2024 23:05:36 +0200 Subject: [PATCH 1/2] Upgrade Android compileSdkVersion from 29 to 34 --- CHANGELOG.md | 5 ++ .../fixtures/app/android/app/build.gradle | 2 +- features/fixtures/app/pubspec.lock | 81 +++++++++++-------- packages/bugsnag_flutter/android/build.gradle | 2 +- 4 files changed, 55 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48c1698..8c8631b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## TBD + +- Upgrade Android compileSdkVersion from 29 to 34. + [263](https://github.com/bugsnag/bugsnag-flutter/pull/263) + ## 4.0.0 (2024-07-29) ### Breaking Changes diff --git a/features/fixtures/app/android/app/build.gradle b/features/fixtures/app/android/app/build.gradle index 228cee6..39004d5 100644 --- a/features/fixtures/app/android/app/build.gradle +++ b/features/fixtures/app/android/app/build.gradle @@ -45,7 +45,7 @@ android { defaultConfig { applicationId "com.bugsnag.flutter.test.app" - minSdkVersion 16 + minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.hasProperty('targetSdkVersion') ? flutter.targetSdkVersion : 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/features/fixtures/app/pubspec.lock b/features/fixtures/app/pubspec.lock index 1b2c248..2e2975a 100644 --- a/features/fixtures/app/pubspec.lock +++ b/features/fixtures/app/pubspec.lock @@ -20,19 +20,18 @@ packages: bugsnag_bridge: dependency: transitive description: - path: "packages/bugsnag-flutter-bridge" - ref: HEAD - resolved-ref: "0a2b35f8b0a5908082ce0f57e85fa9c027a0f0ad" - url: "https://github.com/bugsnag/bugsnag-flutter-common" - source: git - version: "0.1.0" + name: bugsnag_bridge + sha256: "385d280e12abc9169fc20f43c8c28ad5bf970be81d4c077738e12c1f97676b48" + url: "https://pub.dev" + source: hosted + version: "2.1.0" bugsnag_flutter: dependency: "direct main" description: path: "../../../packages/bugsnag_flutter" relative: true source: path - version: "3.1.1" + version: "4.0.0" bugsnag_flutter_dart_io_http_client: dependency: "direct main" description: @@ -67,10 +66,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: @@ -129,14 +128,30 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" - js: + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + url: "https://pub.dev" + source: hosted + version: "10.0.4" + leak_tracker_flutter_testing: dependency: transitive description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + name: leak_tracker_flutter_testing + sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" url: "https://pub.dev" source: hosted - version: "0.6.7" + version: "3.0.3" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" lints: dependency: transitive description: @@ -149,34 +164,34 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.12.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" path_provider: dependency: "direct main" description: @@ -258,18 +273,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -290,10 +305,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.7.0" typed_data: dependency: transitive description: @@ -310,14 +325,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - web: + vm_service: dependency: transitive description: - name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "14.2.1" win32: dependency: transitive description: @@ -335,5 +350,5 @@ packages: source: hosted version: "1.0.4" sdks: - dart: ">=3.1.0-185.0.dev <4.0.0" - flutter: ">=3.10.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/packages/bugsnag_flutter/android/build.gradle b/packages/bugsnag_flutter/android/build.gradle index 3efdec7..6d8a4cb 100644 --- a/packages/bugsnag_flutter/android/build.gradle +++ b/packages/bugsnag_flutter/android/build.gradle @@ -23,7 +23,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 29 + compileSdkVersion 34 if (android.hasProperty('namespace')) { namespace 'com.bugsnag.flutter' From 8c2df17d88317e4d54eafe29fc0e37d13e4d43b7 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 9 Oct 2024 11:19:20 +0200 Subject: [PATCH 2/2] Changed the version to 31 instead of 34 --- CHANGELOG.md | 2 +- features/fixtures/app/pubspec.lock | 81 ++++++++----------- packages/bugsnag_flutter/android/build.gradle | 2 +- 3 files changed, 35 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c8631b..1e62423 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## TBD -- Upgrade Android compileSdkVersion from 29 to 34. +- Upgrade Android compileSdkVersion from 29 to 31. [263](https://github.com/bugsnag/bugsnag-flutter/pull/263) ## 4.0.0 (2024-07-29) diff --git a/features/fixtures/app/pubspec.lock b/features/fixtures/app/pubspec.lock index 2e2975a..1b2c248 100644 --- a/features/fixtures/app/pubspec.lock +++ b/features/fixtures/app/pubspec.lock @@ -20,18 +20,19 @@ packages: bugsnag_bridge: dependency: transitive description: - name: bugsnag_bridge - sha256: "385d280e12abc9169fc20f43c8c28ad5bf970be81d4c077738e12c1f97676b48" - url: "https://pub.dev" - source: hosted - version: "2.1.0" + path: "packages/bugsnag-flutter-bridge" + ref: HEAD + resolved-ref: "0a2b35f8b0a5908082ce0f57e85fa9c027a0f0ad" + url: "https://github.com/bugsnag/bugsnag-flutter-common" + source: git + version: "0.1.0" bugsnag_flutter: dependency: "direct main" description: path: "../../../packages/bugsnag_flutter" relative: true source: path - version: "4.0.0" + version: "3.1.1" bugsnag_flutter_dart_io_http_client: dependency: "direct main" description: @@ -66,10 +67,10 @@ packages: dependency: transitive description: name: collection - sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.18.0" + version: "1.17.2" cupertino_icons: dependency: "direct main" description: @@ -128,30 +129,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" - leak_tracker: - dependency: transitive - description: - name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" - url: "https://pub.dev" - source: hosted - version: "10.0.4" - leak_tracker_flutter_testing: + js: dependency: transitive description: - name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 url: "https://pub.dev" source: hosted - version: "3.0.3" - leak_tracker_testing: - dependency: transitive - description: - name: leak_tracker_testing - sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" - url: "https://pub.dev" - source: hosted - version: "3.0.1" + version: "0.6.7" lints: dependency: transitive description: @@ -164,34 +149,34 @@ packages: dependency: transitive description: name: matcher - sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.16+1" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.9.1" path: dependency: transitive description: name: path - sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.8.3" path_provider: dependency: "direct main" description: @@ -273,18 +258,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.1" string_scanner: dependency: transitive description: @@ -305,10 +290,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.6.0" typed_data: dependency: transitive description: @@ -325,14 +310,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - vm_service: + web: dependency: transitive description: - name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "0.1.4-beta" win32: dependency: transitive description: @@ -350,5 +335,5 @@ packages: source: hosted version: "1.0.4" sdks: - dart: ">=3.3.0 <4.0.0" - flutter: ">=3.18.0-18.0.pre.54" + dart: ">=3.1.0-185.0.dev <4.0.0" + flutter: ">=3.10.0" diff --git a/packages/bugsnag_flutter/android/build.gradle b/packages/bugsnag_flutter/android/build.gradle index 6d8a4cb..b4bf4fb 100644 --- a/packages/bugsnag_flutter/android/build.gradle +++ b/packages/bugsnag_flutter/android/build.gradle @@ -23,7 +23,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 34 + compileSdkVersion 31 if (android.hasProperty('namespace')) { namespace 'com.bugsnag.flutter'