Skip to content

Commit

Permalink
fix: pin flutter version to 3.10.0 #41 (#85)
Browse files Browse the repository at this point in the history
  • Loading branch information
slightfoot authored Dec 20, 2024
1 parent ab569f6 commit 9ffe4e6
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 50 deletions.
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.24.5"
"flutter": "3.10.0"
}
10 changes: 5 additions & 5 deletions melos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,29 @@ scripts:
clean:
name: Clean all
description: Run flutter clean in all packages
run: melos exec -- flutter clean
run: melos exec -- fvm flutter clean

# Pub get all packages
get:
name: Get all
description: Run pub get in all packages
run: melos exec -o -- dart pub get
run: melos exec -o -- fvm flutter pub get

# Pub upgrade all packages
upgrade:
name: Upgrade all
description: Run pub upgrade in all packages
run: melos exec -o -- dart pub upgrade
run: melos exec -o -- fvm flutter pub upgrade

# Build runner (code generation)
brunner:
run: melos exec -o -- dart run build_runner build --delete-conflicting-outputs
run: melos exec -o -- fvm dart run build_runner build --delete-conflicting-outputs
packageFilters:
scope: "clerk_auth"

# Format code
format:
run: melos exec -- dart format --line-length=80 MELOS_PACKAGE_PATH
run: melos exec -- fvm dart format --line-length=80 MELOS_PACKAGE_PATH

# Run build and format code
brunner_format:
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk_auth/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ for your users to sign up, sign in, and manage their profile from your Dart code

## Requirements

* Dart >= 3.5.0
* Dart >= 3.0.0

## Example Usage

Expand Down
14 changes: 7 additions & 7 deletions packages/clerk_auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ topics:
- authentication

environment:
sdk: '>=3.5.0 <4.0.0'
sdk: '>=3.0.0 <4.0.0'

dependencies:
collection: ^1.18.0
http: ^1.2.0
collection: ^1.17.1
http: ^1.1.0
http_parser: ^4.0.2
json_annotation: ^4.9.0
logging: ^1.2.0

dev_dependencies:
build_runner: ^2.4.9
build_runner: any
dart_dotenv: ^1.0.1
json_serializable: ^6.8.0
lints: ^4.0.0
lints: ^3.0.0
mocktail: ^1.0.4
test: ^1.24.0
uuid: ^4.4.2
test: ^1.25.5
uuid: ^4.5.1
4 changes: 2 additions & 2 deletions packages/clerk_flutter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ for your users to sign up, sign in, and manage their profile from your Flutter c

## Requirements

* Flutter >= 3.24.0
* Dart >= 3.5.0
* Flutter >= 3.10.0
* Dart >= 3.0.0

## In Development

Expand Down
6 changes: 3 additions & 3 deletions packages/clerk_flutter/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ publish_to: 'none'
version: 0.1.0

environment:
sdk: '>=3.5.0 <4.0.0'
flutter: '>=3.7.0'
sdk: '>=3.0.0 <4.0.0'
flutter: '>=3.10.0'

dependencies:
flutter:
Expand All @@ -16,7 +16,7 @@ dependencies:
path: ../../clerk_auth/

dev_dependencies:
flutter_lints: ^5.0.0
flutter_lints: ^3.0.1
flutter_test:
sdk: flutter

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:clerk_flutter/src/widgets/ui/style/colors.dart';
import 'package:clerk_flutter/src/widgets/ui/style/text_style.dart';
import 'package:flutter/material.dart';

/// The <OrganizationProfile /> component is used to render a beautiful, full-featured
/// The [OrganizationProfile] component is used to render a beautiful, full-featured
/// organization management UI that allows users to manage their organization profile and
/// security settings.
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class ClerkOrganizationSwitcherWidget extends StatelessWidget {
child: MenuAnchor(
alignmentOffset: const Offset(0.0, 8.0),
style: MenuStyle(
backgroundColor: WidgetStateProperty.all(Colors.transparent),
shadowColor: WidgetStateProperty.all(Colors.transparent),
backgroundColor: MaterialStateProperty.all(Colors.transparent),
shadowColor: MaterialStateProperty.all(Colors.transparent),
),
menuChildren: [
SizedBox(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ class ClerkMaterialButton extends StatelessWidget {
child: FilledButton(
onPressed: onPressed,
style: ButtonStyle(
padding: WidgetStateProperty.all(EdgeInsets.zero),
backgroundColor: WidgetStateProperty.all(color),
foregroundColor: WidgetStateProperty.all(textColor),
shape: WidgetStateProperty.all(
padding: MaterialStateProperty.all(EdgeInsets.zero),
backgroundColor: MaterialStateProperty.all(color),
foregroundColor: MaterialStateProperty.all(textColor),
shape: MaterialStateProperty.all(
RoundedRectangleBorder(
borderRadius: BorderRadius.circular(height / 6),
side: const BorderSide(color: ClerkColors.dawnPink),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ class _EditableUserDataState extends State<_EditableUserData> {
Future<void> _chooseImage(BuildContext context) async {
final picker = ImagePicker();
final image = await picker.pickImage(source: ImageSource.camera);
if (image case XFile image when context.mounted) {
if (context.mounted && image != null) {
setState(() => this.image = File(image.path));
}
}
Expand Down
18 changes: 9 additions & 9 deletions packages/clerk_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ topics:
- authentication

environment:
sdk: '>=3.5.0 <4.0.0'
flutter: '>=3.7.0'
sdk: '>=3.0.0 <4.0.0'
flutter: '>=3.10.0'

dependencies:
clerk_auth: ^0.0.3-dev
collection: ^1.18.0
email_validator: ^3.0.0
flutter:
sdk: flutter
clerk_auth: ^0.0.4-dev
collection: ^1.17.1
email_validator: ^3.0.0
flutter_inset_box_shadow: ^1.0.8
flutter_svg: ^2.0.10+1
image_picker: ^1.1.2
path_provider: ^2.1.5
image_picker: ^1.0.7
path_provider: ^2.1.2
phone_input: ^1.0.0
webview_flutter: ^4.8.0
webview_flutter: ^4.5.0

dev_dependencies:
flutter_lints: ^5.0.0
flutter_lints: ^3.0.1
flutter_test:
sdk: flutter

Expand Down
5 changes: 1 addition & 4 deletions packages/clerk_widgetbook/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ class WidgetbookApp extends StatelessWidget {
InspectorAddon(),
TimeDilationAddon(),
ZoomAddon(),
TextScaleAddon(
min: 1.0,
max: 2.0,
),
TextScaleAddon(scales: [1.0, 1.25, 1.5, 2.0, 3.0]),
LocalizationAddon(
locales: [const Locale('en', 'US')],
localizationsDelegates: [
Expand Down
19 changes: 9 additions & 10 deletions packages/clerk_widgetbook/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,23 @@ publish_to: 'none'
version: 0.1.0

environment:
sdk: '>=3.5.0 <4.0.0'
flutter: '>=3.7.0'
sdk: '>=3.0.0 <4.0.0'
flutter: '>=3.10.0'

dependencies:
flutter:
sdk: flutter
widgetbook: ^3.8.1
widgetbook_annotation: ^3.1.0
clerk_flutter: any
faker: ^2.2.0
flutter_svg: ^2.0.10+1
widgetbook: ^3.8.1
widgetbook_annotation: ^3.2.0
flutter:
sdk: flutter

dev_dependencies:
build_runner: any
flutter_lints: ^3.0.1
widgetbook_generator: ^3.9.1
flutter_test:
sdk: flutter
flutter_lints: ^5.0.0
widgetbook_generator: ^3.8.0
build_runner: ^2.4.6

flutter:
uses-material-design: true
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ description: >
services for Dart and Flutter code.
environment:
sdk: '>=3.0.0 <4.0.0'
flutter: '>=3.10.0'

dev_dependencies:
melos: ^6.1.0

0 comments on commit 9ffe4e6

Please sign in to comment.