diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index f0665d3..2720d1c 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -38,7 +38,7 @@ jobs: with: cache: true channel: stable - flutter-version: 3.44.0 + flutter-version: 3.47.0 - name: Install dependencies & Activate as global executable run: | diff --git a/.github/workflows/flutter.yml b/.github/workflows/flutter.yml index 675a19f..5bdaa2f 100644 --- a/.github/workflows/flutter.yml +++ b/.github/workflows/flutter.yml @@ -26,7 +26,7 @@ jobs: with: cache: true channel: stable - flutter-version: 3.44.0 + flutter-version: 3.47.0 - name: Install dependencies run: flutter pub get diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e00f6f..202d29b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.12.0 - 2026-07-22 + +- flutter 3.44.x compatibility (thanks to [@jpohhhh](https://github.com/jpohhhh)) +- fix native assets bundling (thanks to [@jpohhhh](https://github.com/jpohhhh)) + ## 0.11.0 - 2026-04-19 - flutter 3.41.x compatibility (thanks to [@miguelzapp](https://github.com/miguelzapp)!) diff --git a/analysis_options.yaml b/analysis_options.yaml index 0c09e66..8df97da 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -20,6 +20,13 @@ linter: analyzer: exclude: - lib/src/archive + - build/** + - android/** + - ios/** + - web/** + - windows/** + - macos/** + - linux/** # For more information about the core and recommended set of lints, see # https://dart.dev/go/core-lints diff --git a/lib/src/build_system/build_app.dart b/lib/src/build_system/build_app.dart index b1223af..2423d81 100644 --- a/lib/src/build_system/build_app.dart +++ b/lib/src/build_system/build_app.dart @@ -83,8 +83,7 @@ class AppBuilder { if (includeDebugSymbols) fl.kExtraGenSnapshotOptions: '--no-strip', // used by the KernelSnapshot target - fl.kTargetPlatform: - fl.getNameForTargetPlatform(fl.TargetPlatform.linux_arm64), + fl.kTargetPlatform: fl.TargetPlatform.linux_arm64.getName(), fl.kTargetFile: mainPath, fl.kDeferredComponents: 'false', ...buildInfo.toBuildSystemEnvironment(), diff --git a/lib/src/build_system/targets.dart b/lib/src/build_system/targets.dart index 5479564..9087cb0 100644 --- a/lib/src/build_system/targets.dart +++ b/lib/src/build_system/targets.dart @@ -23,7 +23,7 @@ class ReleaseBundleFlutterpiAssets extends CompositeTarget { buildMode: BuildMode.release, ), CopyIcudtl(layout: layout), - const DartBuildForNative(), + const LinkHooks(), const KernelSnapshot(), const InstallCodeAssets(), CopyFlutterpiEngine( @@ -63,7 +63,7 @@ class ProfileBundleFlutterpiAssets extends CompositeTarget { buildMode: BuildMode.profile, ), CopyIcudtl(layout: layout), - const DartBuildForNative(), + const LinkHooks(), const KernelSnapshot(), const InstallCodeAssets(), CopyFlutterpiEngine( @@ -103,7 +103,7 @@ class DebugBundleFlutterpiAssets extends CompositeTarget { buildMode: BuildMode.debug, ), CopyIcudtl(layout: layout), - const DartBuildForNative(), + const LinkHooks(), const KernelSnapshot(), const InstallCodeAssets(), CopyFlutterpiEngine( @@ -479,7 +479,7 @@ class CopyFlutterAssets extends Target { @override List get dependencies => [ - const DartBuildForNative(), + const LinkHooks(), const KernelSnapshot(), const InstallCodeAssets(), ]; @@ -534,7 +534,7 @@ class CopyFlutterAssets extends Target { final versionInfo = getVersionInfo(environment.defines); - final dartHookResult = await DartBuild.loadHookResult(environment); + final dartHookResult = await LinkHooks.loadHookResult(environment); final depfile = await copyAssets( environment, outputDir, diff --git a/lib/src/context.dart b/lib/src/context.dart index 10560fe..1f5b6c4 100644 --- a/lib/src/context.dart +++ b/lib/src/context.dart @@ -73,7 +73,6 @@ Future runInContext( ), cache: globals.flutterpiCache, ), - fl.Usage: () => fl.DisabledUsage(), FlutterPiToolConfig: () => FlutterPiToolConfig( fs: globals.fs, logger: globals.logger, diff --git a/lib/src/fltool/common.dart b/lib/src/fltool/common.dart index 19e2331..65e2940 100644 --- a/lib/src/fltool/common.dart +++ b/lib/src/fltool/common.dart @@ -66,8 +66,6 @@ export 'package:flutter_tools/src/persistent_tool_state.dart'; export 'package:flutter_tools/src/project.dart'; export 'package:flutter_tools/src/protocol_discovery.dart'; export 'package:flutter_tools/src/reporting/crash_reporting.dart'; -export 'package:flutter_tools/src/reporting/first_run.dart'; -export 'package:flutter_tools/src/reporting/reporting.dart'; export 'package:flutter_tools/src/reporting/unified_analytics.dart'; export 'package:flutter_tools/src/resident_runner.dart'; export 'package:flutter_tools/src/run_hot.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index faf36cf..2962ef2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: flutterpi_tool description: A tool to make development & distribution of flutter-pi apps easier. -version: 0.11.0 +version: 0.12.0 repository: https://github.com/ardera/flutterpi_tool environment: sdk: ^3.0.5 - flutter: ">=3.44.0" + flutter: ">=3.47.0" executables: # TODO(ardera): Maybe add an alias `flutterpi-tool` here? diff --git a/test/src/context.dart b/test/src/context.dart index 9a58b2a..74c7406 100644 --- a/test/src/context.dart +++ b/test/src/context.dart @@ -90,7 +90,6 @@ Future runInThrowingContext( fltool.Stdio: () => fail(fltool.Stdio), fltool.SystemClock: () => fail(fltool.SystemClock), fltool.Signals: () => fail(fltool.Signals), - fltool.Usage: () => fail(fltool.Usage), fltool.UserMessages: () => fail(fltool.UserMessages), fltool.VisualStudioValidator: () => fail(fltool.VisualStudioValidator), fltool.WebWorkflow: () => fail(fltool.WebWorkflow), diff --git a/test/src/test_feature_flags.dart b/test/src/test_feature_flags.dart index 64dcd97..6ad0bf9 100644 --- a/test/src/test_feature_flags.dart +++ b/test/src/test_feature_flags.dart @@ -12,6 +12,7 @@ class TestFeatureFlags implements fl.FeatureFlags { this.areCustomDevicesEnabled = false, this.isCliAnimationEnabled = true, this.isNativeAssetsEnabled = false, + this.isRecordUseEnabled = false, this.isSwiftPackageManagerEnabled = false, this.isOmitLegacyVersionFileEnabled = false, this.isLLDBDebuggingEnabled = false, @@ -20,6 +21,7 @@ class TestFeatureFlags implements fl.FeatureFlags { this.isWindowingEnabled = false, this.isAccessibilityEvaluationsEnabled = false, this.isRiscv64SupportEnabled = false, + this.isMacOSArm64OnlyEnabled = false, }); @override @@ -52,6 +54,9 @@ class TestFeatureFlags implements fl.FeatureFlags { @override final bool isNativeAssetsEnabled; + @override + final bool isRecordUseEnabled; + @override final bool isSwiftPackageManagerEnabled; @@ -76,6 +81,9 @@ class TestFeatureFlags implements fl.FeatureFlags { @override final bool isRiscv64SupportEnabled; + @override + final bool isMacOSArm64OnlyEnabled; + @override bool isEnabled(fl.Feature feature) { return switch (feature) { @@ -89,6 +97,7 @@ class TestFeatureFlags implements fl.FeatureFlags { fl.flutterCustomDevicesFeature => areCustomDevicesEnabled, fl.cliAnimation => isCliAnimationEnabled, fl.nativeAssets => isNativeAssetsEnabled, + fl.recordUse => isRecordUseEnabled, fl.swiftPackageManager => isSwiftPackageManagerEnabled, fl.omitLegacyVersionFile => isOmitLegacyVersionFileEnabled, fl.lldbDebugging => isLLDBDebuggingEnabled, @@ -97,6 +106,7 @@ class TestFeatureFlags implements fl.FeatureFlags { fl.windowingFeature => isWindowingEnabled, fl.accessibilityEvaluationsFeature => isAccessibilityEvaluationsEnabled, fl.riscv64 => isRiscv64SupportEnabled, + fl.macOSArm64Only => isMacOSArm64OnlyEnabled, _ => false, }; } @@ -113,6 +123,7 @@ class TestFeatureFlags implements fl.FeatureFlags { fl.flutterCustomDevicesFeature, fl.cliAnimation, fl.nativeAssets, + fl.recordUse, fl.swiftPackageManager, fl.omitLegacyVersionFile, fl.lldbDebugging, @@ -121,6 +132,7 @@ class TestFeatureFlags implements fl.FeatureFlags { fl.windowingFeature, fl.accessibilityEvaluationsFeature, fl.riscv64, + fl.macOSArm64Only, ]; @override