From 587a08afda3ea13ec36cda092a252dbfef6ae250 Mon Sep 17 00:00:00 2001 From: Jonas Wanke Date: Tue, 21 May 2024 16:05:30 +0200 Subject: [PATCH] Upgrade to Flutter ^3.22.0, Dart ^3.4.0 --- .github/workflows/build.yml | 4 ++-- example/pubspec.lock | 4 ++-- example/pubspec.yaml | 4 ++-- flake.nix | 6 ++++-- pubspec.yaml | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0c3894..bbcba6f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: include: - flutter-channel: stable - flutter-channel: beta - - flutter-version: 3.16.0 + - flutter-version: 3.22.0 fail-fast: false steps: - uses: actions/checkout@v4 @@ -44,7 +44,7 @@ jobs: include: - flutter-channel: stable - flutter-channel: beta - - flutter-version: 3.16.0 + - flutter-version: 3.22.0 fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/example/pubspec.lock b/example/pubspec.lock index 1a1e910..762dc38 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -579,5 +579,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0-0 <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.4.0 <4.0.0" + flutter: ">=3.22.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 1dc0a10..9ecb75e 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -2,8 +2,8 @@ name: swipeable_page_route_example publish_to: none environment: - sdk: '>=3.2.0 <4.0.0' - flutter: '>=3.16.0' + sdk: ^3.4.0 + flutter: ^3.22.0 dependencies: flutter: diff --git a/flake.nix b/flake.nix index f8e9049..d3ba02d 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,8 @@ }; }; + flutter = pkgs.flutterPackages.v3_22; + # Android androidSdkArgs = { buildToolsVersions = [ "30.0.3" ]; @@ -44,8 +46,8 @@ devShell = with pkgs; mkShell { ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk"; - FLUTTER_ROOT = flutterPackages.v3_19; - buildInputs = [ androidEmulator androidSdk flutterPackages.v3_19 ]; + FLUTTER_ROOT = flutter; + buildInputs = [ androidEmulator androidSdk flutter ]; }; }); } diff --git a/pubspec.yaml b/pubspec.yaml index 2440b63..2deda07 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,8 +7,8 @@ screenshots: path: doc/demo.gif environment: - sdk: '>=3.2.0 <4.0.0' - flutter: '>=3.16.0' + sdk: ^3.4.0 + flutter: ^3.22.0 dependencies: black_hole_flutter: ^1.0.3