Skip to content

Commit

Permalink
Upgrade to Flutter 3.27 & use pub workspace (#308)
Browse files Browse the repository at this point in the history
* WIP

* Tweak workspace

* Upgrade to 3.27

* Fix broken test config

* Update goldens

* Regenerate golden images

* More tweaks

* Disable automatic generation of localization files

* Commit from GitHub Actions (Forui Hooks Presubmit)

---------

Co-authored-by: Pante <[email protected]>
  • Loading branch information
Pante and Pante authored Dec 12, 2024
1 parent cc9539d commit 1f90a7a
Show file tree
Hide file tree
Showing 623 changed files with 302 additions and 1,000 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ jobs:
- uses: actions/checkout@v4
- uses: subosito/[email protected]
with:
flutter-version: 3.24.x
flutter-version: 3.27.x
cache: true

- run: flutter pub get
- run: flutter pub run build_runner build --delete-conflicting-outputs
- run: dart run build_runner build --delete-conflicting-outputs
- run: flutter build web

- name: Publish to Cloudflare Pages
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs_preview_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ jobs:
# Publish samples
- uses: subosito/[email protected]
with:
flutter-version: 3.24.x
flutter-version: 3.27.x
cache: true
- working-directory: ./samples
run: |
flutter pub get
flutter pub run build_runner build --delete-conflicting-outputs
dart run build_runner build --delete-conflicting-outputs
flutter build web
- uses: cloudflare/wrangler-action@v3
id: publish-samples
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/forui_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
flutter-version: ${{ matrix.flutter-version }}
cache: true
- run: flutter pub get
- run: flutter pub run build_runner build --delete-conflicting-outputs
- run: dart run build_runner build --delete-conflicting-outputs
- run: |
output=$(dart doc --validate-links .)
if echo "$output" | grep -q "Found 0 warnings and 0 errors"; then
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
cache: true

- run: flutter pub get
- run: flutter pub run build_runner build --delete-conflicting-outputs
- run: dart run build_runner build --delete-conflicting-outputs
- run: flutter build appbundle --debug --no-pub --no-tree-shake-icons

build-ios:
Expand All @@ -77,7 +77,7 @@ jobs:
cache: true

- run: flutter pub get
- run: flutter pub run build_runner build --delete-conflicting-outputs
- run: dart run build_runner build --delete-conflicting-outputs
- run: pod repo update
working-directory: forui/example/ios
- run: flutter build ios --debug --no-codesign --no-pub
3 changes: 1 addition & 2 deletions .github/workflows/forui_hooks_presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ jobs:
cache: true

- run: flutter pub get
- run: flutter pub global activate import_sorter
- run: flutter pub global run import_sorter:main
- run: dart run ../tool/sort.dart forui_samples
- run: dart format --line-length 120 .
- run: dart fix --apply
# We format the code again since the required trailing comma lint fixes causes code to be formatted differently
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/forui_presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ jobs:
cache: true

- run: flutter pub get
- run: flutter pub global activate import_sorter
- run: flutter pub global run import_sorter:main
- run: flutter pub run build_runner build --delete-conflicting-outputs
- run: dart run ../tool/sort.dart forui_samples
- run: dart run build_runner build --delete-conflicting-outputs
- run: dart format --line-length 120 .
- run: dart fix --apply
# We format the code again since the required trailing comma lint fixes causes code to be formatted differently
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/samples_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ jobs:
flutter-version: ${{ matrix.flutter-version }}
cache: true
- run: flutter pub get
- run: flutter pub run build_runner build --delete-conflicting-outputs
- run: dart run build_runner build --delete-conflicting-outputs
- run: flutter analyze
5 changes: 2 additions & 3 deletions .github/workflows/samples_presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,8 @@ jobs:
cache: true

- run: flutter pub get
- run: flutter pub global activate import_sorter
- run: flutter pub global run import_sorter:main
- run: flutter pub run build_runner build --delete-conflicting-outputs
- run: dart run ../tool/sort.dart forui_samples
- run: dart run build_runner build --delete-conflicting-outputs
- run: dart format --line-length 120 .
- run: dart fix --apply
# We format the code again since the required trailing comma lint fixes causes code to be formatted differently
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,5 @@ build/
**/linux/flutter/generated_plugin_registrant.cc
**/linux/flutter/generated_plugin_registrant.h
**/linux/flutter/generated_plugins.cmake
.flutter-plugins
.flutter-plugins-dependencies
2 changes: 2 additions & 0 deletions forui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## 0.8.0 (Next)

Bump minimum Flutter version to 3.27.0.

### Additions

* Add `showFSheet(...)`.
Expand Down
1 change: 0 additions & 1 deletion forui/example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.foruslabs.forui.example"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
Expand Down
72 changes: 36 additions & 36 deletions forui/example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
url: "https://pub.dev"
source: hosted
version: "72.0.0"
version: "76.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
version: "0.3.3"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
url: "https://pub.dev"
source: hosted
version: "6.7.0"
version: "6.11.0"
args:
dependency: transitive
description:
Expand Down Expand Up @@ -146,10 +146,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
url: "https://pub.dev"
source: hosted
version: "1.18.0"
version: "1.19.0"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -317,10 +317,10 @@ packages:
dependency: transitive
description:
name: http_parser
sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
url: "https://pub.dev"
source: hosted
version: "4.0.2"
version: "4.1.1"
intl:
dependency: "direct main"
description:
Expand All @@ -333,10 +333,10 @@ packages:
dependency: transitive
description:
name: io
sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
url: "https://pub.dev"
source: hosted
version: "1.0.4"
version: "1.0.5"
js:
dependency: transitive
description:
Expand All @@ -357,18 +357,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.7"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.8"
leak_tracker_testing:
dependency: transitive
description:
Expand All @@ -389,10 +389,10 @@ packages:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
version: "0.1.3-main.0"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -453,10 +453,10 @@ packages:
dependency: transitive
description:
name: package_config
sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
package_info_plus:
dependency: transitive
description:
Expand Down Expand Up @@ -501,10 +501,10 @@ packages:
dependency: transitive
description:
name: path_provider_android
sha256: "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7"
sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
url: "https://pub.dev"
source: hosted
version: "2.2.14"
version: "2.2.15"
path_provider_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -573,10 +573,10 @@ packages:
dependency: transitive
description:
name: pub_semver
sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
pubspec_parse:
dependency: transitive
description:
Expand All @@ -589,10 +589,10 @@ packages:
dependency: transitive
description:
name: shelf
sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
url: "https://pub.dev"
source: hosted
version: "1.4.1"
version: "1.4.2"
shelf_web_socket:
dependency: transitive
description:
Expand All @@ -605,7 +605,7 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
source_gen:
dependency: transitive
description:
Expand All @@ -626,10 +626,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
version: "1.12.0"
stream_channel:
dependency: transitive
description:
Expand All @@ -650,10 +650,10 @@ packages:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.0"
sugar:
dependency: "direct main"
description:
Expand All @@ -674,10 +674,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.3"
timing:
dependency: transitive
description:
Expand Down Expand Up @@ -730,10 +730,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
url: "https://pub.dev"
source: hosted
version: "14.2.5"
version: "14.3.0"
wakelock_plus:
dependency: "direct main"
description:
Expand Down Expand Up @@ -815,5 +815,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.5.0 <4.0.0"
flutter: ">=3.24.0"
dart: ">=3.6.0 <4.0.0"
flutter: ">=3.27.0"
4 changes: 2 additions & 2 deletions forui/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: '>=3.3.0 <4.0.0'
flutter: ">=3.24.0"
sdk: '>=3.6.0 <4.0.0'
flutter: ">=3.27.0"

dependencies:
flutter:
Expand Down
Loading

0 comments on commit 1f90a7a

Please sign in to comment.