Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flutter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)!)
Expand Down
7 changes: 7 additions & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions lib/src/build_system/build_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
10 changes: 5 additions & 5 deletions lib/src/build_system/targets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ReleaseBundleFlutterpiAssets extends CompositeTarget {
buildMode: BuildMode.release,
),
CopyIcudtl(layout: layout),
const DartBuildForNative(),
const LinkHooks(),
const KernelSnapshot(),
const InstallCodeAssets(),
CopyFlutterpiEngine(
Expand Down Expand Up @@ -63,7 +63,7 @@ class ProfileBundleFlutterpiAssets extends CompositeTarget {
buildMode: BuildMode.profile,
),
CopyIcudtl(layout: layout),
const DartBuildForNative(),
const LinkHooks(),
const KernelSnapshot(),
const InstallCodeAssets(),
CopyFlutterpiEngine(
Expand Down Expand Up @@ -103,7 +103,7 @@ class DebugBundleFlutterpiAssets extends CompositeTarget {
buildMode: BuildMode.debug,
),
CopyIcudtl(layout: layout),
const DartBuildForNative(),
const LinkHooks(),
const KernelSnapshot(),
const InstallCodeAssets(),
CopyFlutterpiEngine(
Expand Down Expand Up @@ -479,7 +479,7 @@ class CopyFlutterAssets extends Target {

@override
List<Target> get dependencies => <Target>[
const DartBuildForNative(),
const LinkHooks(),
const KernelSnapshot(),
const InstallCodeAssets(),
];
Expand Down Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion lib/src/context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ Future<V> runInContext<V>(
),
cache: globals.flutterpiCache,
),
fl.Usage: () => fl.DisabledUsage(),
FlutterPiToolConfig: () => FlutterPiToolConfig(
fs: globals.fs,
logger: globals.logger,
Expand Down
2 changes: 0 additions & 2 deletions lib/src/fltool/common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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?
Expand Down
1 change: 0 additions & 1 deletion test/src/context.dart
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ Future<V> runInThrowingContext<V>(
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),
Expand Down
12 changes: 12 additions & 0 deletions test/src/test_feature_flags.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -20,6 +21,7 @@ class TestFeatureFlags implements fl.FeatureFlags {
this.isWindowingEnabled = false,
this.isAccessibilityEvaluationsEnabled = false,
this.isRiscv64SupportEnabled = false,
this.isMacOSArm64OnlyEnabled = false,
});

@override
Expand Down Expand Up @@ -52,6 +54,9 @@ class TestFeatureFlags implements fl.FeatureFlags {
@override
final bool isNativeAssetsEnabled;

@override
final bool isRecordUseEnabled;

@override
final bool isSwiftPackageManagerEnabled;

Expand All @@ -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) {
Expand All @@ -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,
Expand All @@ -97,6 +106,7 @@ class TestFeatureFlags implements fl.FeatureFlags {
fl.windowingFeature => isWindowingEnabled,
fl.accessibilityEvaluationsFeature => isAccessibilityEvaluationsEnabled,
fl.riscv64 => isRiscv64SupportEnabled,
fl.macOSArm64Only => isMacOSArm64OnlyEnabled,
_ => false,
};
}
Expand All @@ -113,6 +123,7 @@ class TestFeatureFlags implements fl.FeatureFlags {
fl.flutterCustomDevicesFeature,
fl.cliAnimation,
fl.nativeAssets,
fl.recordUse,
fl.swiftPackageManager,
fl.omitLegacyVersionFile,
fl.lldbDebugging,
Expand All @@ -121,6 +132,7 @@ class TestFeatureFlags implements fl.FeatureFlags {
fl.windowingFeature,
fl.accessibilityEvaluationsFeature,
fl.riscv64,
fl.macOSArm64Only,
];

@override
Expand Down
Loading