diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 19e816e6a9d1..379e78b1de5d 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -20,7 +20,7 @@ jobs: tag_name: ${{ steps.release_please.outputs.tag_name }} steps: - name: Release-please - uses: google-github-actions/release-please-action@v4 + uses: googleapis/release-please-action@v4 id: release_please with: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/packages/scanner/shared/pubspec.yaml b/packages/scanner/shared/pubspec.yaml index f5dfe06c9880..942e7faec42b 100644 --- a/packages/scanner/shared/pubspec.yaml +++ b/packages/scanner/shared/pubspec.yaml @@ -9,7 +9,7 @@ environment: dependencies: flutter: sdk: flutter - flutter_svg: 2.0.11 + flutter_svg: 2.0.13 visibility_detector: 0.4.0+2 provider: 6.1.2 diff --git a/packages/smooth_app/lib/database/dao_osm_location.dart b/packages/smooth_app/lib/database/dao_osm_location.dart index 8a4958b2637e..05314c185e68 100644 --- a/packages/smooth_app/lib/database/dao_osm_location.dart +++ b/packages/smooth_app/lib/database/dao_osm_location.dart @@ -62,9 +62,31 @@ class DaoOsmLocation extends AbstractSqlDao { ',PRIMARY KEY($_columnId,$_columnType) on conflict replace' ')'); } + + /// Not brilliant, but for historical reasons we have to catch that here. + bool isDuplicateColumnException( + final DatabaseException e, + final String column, + ) => + e.toString().startsWith( + 'DatabaseException(duplicate column name: $column (code 1 SQLITE_ERROR)'); + if (oldVersion < 7) { - await db.execute('alter table $_table add column $_columnOsmKey TEXT'); - await db.execute('alter table $_table add column $_columnOsmValue TEXT'); + try { + await db.execute('alter table $_table add column $_columnOsmKey TEXT'); + } on DatabaseException catch (e) { + if (!isDuplicateColumnException(e, _columnOsmKey)) { + rethrow; + } + } + try { + await db + .execute('alter table $_table add column $_columnOsmValue TEXT'); + } on DatabaseException catch (e) { + if (!isDuplicateColumnException(e, _columnOsmValue)) { + rethrow; + } + } } } diff --git a/packages/smooth_app/lib/pages/product/product_page/new_product_page.dart b/packages/smooth_app/lib/pages/product/product_page/new_product_page.dart index 2747e07c2f3a..893a684006bc 100644 --- a/packages/smooth_app/lib/pages/product/product_page/new_product_page.dart +++ b/packages/smooth_app/lib/pages/product/product_page/new_product_page.dart @@ -222,6 +222,7 @@ class ProductPageState extends State upToDateProduct, _productPreferences, isFullVersion: true, + showQuestionsBanner: true, ), ), ), diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock index dc198e56c2c4..2835d86b890b 100644 --- a/packages/smooth_app/pubspec.lock +++ b/packages/smooth_app/pubspec.lock @@ -751,10 +751,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: "6f1b756f6e863259a99135ff3c95026c3cdca17d10ebef2bba2261a25ddc8bbc" + sha256: ce89c5a993ca5eea74535f798478502c30a625ecb10a1de4d7fef5cd1bcac2a4 url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.4.1" graphs: dependency: transitive description: @@ -1783,10 +1783,10 @@ packages: dependency: "direct main" description: name: webview_flutter_android - sha256: "74693a212d990b32e0b7055d27db973a18abf31c53942063948cdfaaef9787ba" + sha256: dec83a8da0a2dcd8a25418534cc59348dbc2855fa1dd0cc929c62b6029fde392 url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.0.1" webview_flutter_platform_interface: dependency: transitive description: @@ -1799,10 +1799,10 @@ packages: dependency: "direct main" description: name: webview_flutter_wkwebview - sha256: d4034901d96357beb1b6717ebf7d583c88e40cfc6eb85fe76dd1bf0979a9f251 + sha256: f14ee08021772fed913da8daebcfdeb46be457081e521e93e9918fe6cd1ce9e8 url: "https://pub.dev" source: hosted - version: "3.16.0" + version: "3.16.1" win32: dependency: transitive description: diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml index 1ef42549ba7d..239e82330241 100644 --- a/packages/smooth_app/pubspec.yaml +++ b/packages/smooth_app/pubspec.yaml @@ -13,11 +13,11 @@ dependencies: sdk: flutter async: 2.11.0 - go_router: 14.3.0 + go_router: 14.4.1 barcode_widget: 2.0.4 carousel_slider: 5.0.0 cupertino_icons: 1.0.8 - flutter_svg: 2.0.11 + flutter_svg: 2.0.13 flutter_map: 7.0.2 html: 0.15.4 flutter_widget_from_html_core: 0.8.3+1 @@ -62,8 +62,8 @@ dependencies: shimmer: ^3.0.0 rive: 0.13.15 webview_flutter: 4.10.0 - webview_flutter_android: 4.0.0 - webview_flutter_wkwebview: 3.16.0 + webview_flutter_android: 4.0.1 + webview_flutter_wkwebview: 3.16.1 flutter_custom_tabs: 2.1.0 flutter_image_compress: 2.3.0 connectivity_plus: 5.0.2