Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: bump flutter version to 3.19.0 #365

Merged
merged 11 commits into from
Jul 9, 2024
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
4 changes: 2 additions & 2 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"flutter": "3.10.6",
"flutter": "3.19.0",
"flavors": {
"prod": "stable",
"mincompat": "3.10.6"
"mincompat": "3.19.0"
}
}
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
run-dcm: false
flutter-version: '3.10.6'
flutter-version: '3.19.0'
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"source.fixAll": "explicit",
"source.dcm.fixAll": "explicit"
},
"dart.flutterSdkPath": ".fvm/versions/3.10.6",
"dart.flutterSdkPath": ".fvm/versions/3.19.0",
"search.exclude": {
"**/.fvm/versions": true
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//
// Generated file. Do not edit.
//

import FlutterMacOS
import Foundation

import path_provider_foundation

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// This is a generated file; do not edit or check into version control.
FLUTTER_ROOT=/Users/lucasoliveira/fvm/versions/3.19.0
FLUTTER_APPLICATION_PATH=/Users/lucasoliveira/Developer/Concepta/open_source/mix_ecosystem/mix/examples/themed_button
COCOAPODS_PARALLEL_CODE_SIGN=true
FLUTTER_BUILD_DIR=build
FLUTTER_BUILD_NAME=1.0.0
FLUTTER_BUILD_NUMBER=1
DART_OBFUSCATION=false
TRACK_WIDGET_CREATION=true
TREE_SHAKE_ICONS=false
PACKAGE_CONFIG=.dart_tool/package_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=/Users/lucasoliveira/fvm/versions/3.19.0"
export "FLUTTER_APPLICATION_PATH=/Users/lucasoliveira/Developer/Concepta/open_source/mix_ecosystem/mix/examples/themed_button"
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
export "FLUTTER_BUILD_DIR=build"
export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=true"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.dart_tool/package_config.json"
43 changes: 43 additions & 0 deletions examples/themed_button/macos/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
platform :osx, '10.14'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

project 'Runner', {
'Debug' => :debug,
'Profile' => :release,
'Release' => :release,
}

def flutter_root
generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
unless File.exist?(generated_xcode_build_settings_path)
raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
end

File.foreach(generated_xcode_build_settings_path) do |line|
matches = line.match(/FLUTTER_ROOT\=(.*)/)
return matches[1].strip if matches
end
raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
end

require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)

flutter_macos_podfile_setup

target 'Runner' do
use_frameworks!
use_modular_headers!

flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
target 'RunnerTests' do
inherit! :search_paths
end
end

post_install do |installer|
installer.pods_project.targets.each do |target|
flutter_additional_macos_build_settings(target)
end
end
4 changes: 2 additions & 2 deletions examples/themed_button/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish_to: "none"
version: 1.0.0+1

environment:
sdk: ">=3.0.6 <4.0.0"
flutter: ">=3.10.6"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
flutter:
Expand Down
4 changes: 2 additions & 2 deletions examples/todo_list/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ publish_to: "none"
version: 1.0.0+1

environment:
sdk: ">=3.0.6 <4.0.0"
flutter: ">=3.10.6"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"

dependencies:
flutter:
Expand Down
4 changes: 2 additions & 2 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ categories:
command:
bootstrap:
environment:
sdk: ">=3.0.6 <4.0.0"
flutter: ">=3.10.6"
sdk: ">=3.3.0 <4.0.0"
flutter: ">=3.19.0"
publish:
hooks:
pre: melos run brb
Expand Down
1 change: 1 addition & 0 deletions packages/mix/analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dart_code_metrics:
avoid-importing-entrypoint-exports:
only-in-src: true
prefer-match-file-name: false
prefer-overriding-parent-equality: false
prefer-correct-callback-field-name: false
prefer-single-widget-per-file: false
match-getter-setter-field-names: false
Expand Down
7 changes: 6 additions & 1 deletion packages/mix/lib/src/attributes/scalars/scalar_util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import 'dart:io';
import 'dart:typed_data';
import 'dart:ui';

import 'package:flutter/widgets.dart';
import 'package:mix/mix.dart';
Expand Down Expand Up @@ -161,3 +160,9 @@ final class FontFamilyUtility<T extends Attribute> extends MixUtility<T, String>
with _$FontFamilyUtility {
const FontFamilyUtility(super.builder);
}

@MixableClassUtility()
final class TextScalerUtility<T extends Attribute>
extends MixUtility<T, TextScaler> with _$TextScalerUtility {
const TextScalerUtility(super.builder);
}
19 changes: 19 additions & 0 deletions packages/mix/lib/src/attributes/scalars/scalar_util.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// ignore_for_file: prefer_relative_imports,avoid-importing-entrypoint-exports

import 'dart:ui';

import 'package:flutter/widgets.dart';
import 'package:mix/mix.dart';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'dart:ui';

import 'package:flutter/widgets.dart';

Expand Down
2 changes: 2 additions & 0 deletions packages/mix/lib/src/specs/box/box_spec.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/mix/lib/src/specs/flex/flex_spec.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/mix/lib/src/specs/icon/icon_spec.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/mix/lib/src/specs/image/image_spec.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/mix/lib/src/specs/stack/stack_spec.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions packages/mix/lib/src/specs/text/text_spec.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ final class TextSpec extends Spec<TextSpec> with _$TextSpec {
final TextOverflow? overflow;
final StrutStyle? strutStyle;
final TextAlign? textAlign;
final double? textScaleFactor;
final int? maxLines;
final TextWidthBasis? textWidthBasis;
final TextHeightBehavior? textHeightBehavior;
final TextScaler? textScaler;
final TextStyle? style;
final TextDirection? textDirection;
final bool? softWrap;

@Deprecated('Use textScaler instead')
final double? textScaleFactor;

@MixableProperty(
utilities: [
MixableUtility(
Expand All @@ -41,7 +44,8 @@ final class TextSpec extends Spec<TextSpec> with _$TextSpec {
this.overflow,
this.strutStyle,
this.textAlign,
this.textScaleFactor,
@Deprecated('Use textScaler instead') this.textScaleFactor,
this.textScaler,
this.maxLines,
this.style,
this.textWidthBasis,
Expand All @@ -50,7 +54,10 @@ final class TextSpec extends Spec<TextSpec> with _$TextSpec {
this.softWrap,
this.directive,
super.animated,
});
}) : assert(
textScaler == null || textScaleFactor == null,
'textScaleFactor is deprecated and cannot be specified when textScaler is specified.',
);

Widget call(String text, {String? semanticLabel, Locale? locale}) {
return isAnimated
Expand Down
Loading
Loading