Skip to content

Commit

Permalink
Merge branch 'main' into update-link-in-comment
Browse files Browse the repository at this point in the history
  • Loading branch information
nilsreichardt authored Dec 20, 2024
2 parents 1e3d3bd + ea733b9 commit 1240c6c
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 48 deletions.
5 changes: 2 additions & 3 deletions .fvm/fvm_config.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"flutterSdkVersion": "2.5.0",
"flavors": {}
}
"flutterSdkVersion": "3.3.0"
}
4 changes: 4 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"flutter": "3.3.0",
"flavors": {}
}
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ concurrency:
env:
# The minimum Flutter version that is supported by the packages.
#
# Uses Dart SDK v2.14.0 because it is the minimum version that supports
MIN_FLUTTER_VERSION: 2.5.0
# Uses Dart SDK v2.18.0 because it is the minimum version that supports
MIN_FLUTTER_VERSION: 3.3.0
# The minimum Dart version that is supported by the packages.
#
# Is also used in the Dart SDK matrix (needs to be updated there too, can't
# use env var - see: https://stackoverflow.com/a/74073435/8358501)
MIN_DART_VERSION: 2.14.0
MIN_DART_VERSION: 2.18.0

jobs:
test:
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
sdk: [stable, beta, 2.14.0]
sdk: [stable, beta, 2.18.0]
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ secrets.env
# the cache of the selected version. We should add this to our .gitignore.
#
# Source: https://fvm.app/docs/getting_started/configuration#project
.fvm/flutter_sdk

# FVM Version Cache
.fvm/
10 changes: 1 addition & 9 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
{
// Set the path of the Flutter SDK to the path of the FVM Flutter version.
//
// VS Code will always use the version selected within the project for all
// IDE tooling.
//
// Source: https://fvm.app/docs/getting_started/configuration#option-1---automatic-switching-recommended
"dart.flutterSdkPath": ".fvm/flutter_sdk",
"dart.flutterSdkPath": ".fvm/versions/3.3.0",
"search.exclude": {
// Remove .fvm files from search
"**/.fvm": true
},
"files.watcherExclude": {
// Remove .fvm files from file watching
"**/.fvm": true
},
"eslint.workingDirectories": ["packages/qr_server"]
Expand Down
2 changes: 1 addition & 1 deletion packages/app_preview_example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"
version: 1.0.0+1

environment:
sdk: ">=2.14.0 <3.0.0"
sdk: ">=2.18.0 <3.0.0"

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion packages/app_preview_lints/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: app_preview_lints
description: Set of lint rules for for the app preview CLI.

environment:
sdk: ">=2.14.0 <3.0.0"
sdk: ">=2.18.0 <3.0.0"

dependencies:
lints: ^1.0.1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class CommentPoster {
final shouldEdit = previousComment != null;

if (shouldEdit) {
await _gitHubApi.editComment(previousComment!.id, comment);
await _gitHubApi.editComment(previousComment.id, comment);
} else {
await _gitHubApi.postComment(comment);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/codemagic_app_preview/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ issue_tracker: https://github.com/nilsreichardt/codemagic-app-preview/issues
version: 0.2.2

environment:
sdk: ">=2.14.0 <4.0.0"
sdk: ">=2.18.0 <4.0.0"

dependencies:
args: ^2.3.1
Expand Down
54 changes: 27 additions & 27 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.18.0"
conventional_commit:
dependency: transitive
description:
Expand Down Expand Up @@ -93,18 +93,18 @@ packages:
dependency: transitive
description:
name: graphs
sha256: "772db3d53d23361d4ffcf5a9bb091cf3ee9b22f2be52cd107cd7a2683a89ba0e"
sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
url: "https://pub.dev"
source: hosted
version: "2.3.0"
version: "2.3.1"
http:
dependency: transitive
description:
name: http
sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
url: "https://pub.dev"
source: hosted
version: "0.13.6"
version: "0.13.5"
http_parser:
dependency: transitive
description:
Expand All @@ -125,34 +125,34 @@ packages:
dependency: transitive
description:
name: json_annotation
sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
url: "https://pub.dev"
source: hosted
version: "4.8.1"
version: "4.8.0"
matcher:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
melos:
dependency: "direct dev"
description:
name: melos
sha256: "3f22f6cc629d72acf3acc8a7f8563384550290fa30790efa328c9cf606aa17d7"
sha256: "96e64bbade5712c3f010137e195bca9f1b351fac34ab1f322af492ae34032067"
url: "https://pub.dev"
source: hosted
version: "3.1.1"
version: "3.4.0"
meta:
dependency: transitive
description:
name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.16.0"
mustache_template:
dependency: transitive
description:
Expand All @@ -173,10 +173,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
sha256: "57c07bf82207aee366dfaa3867b3164e4f03a238a461a11b0e8a3a510d51203d"
url: "https://pub.dev"
source: hosted
version: "3.1.0"
version: "3.1.1"
pool:
dependency: transitive
description:
Expand Down Expand Up @@ -229,10 +229,10 @@ packages:
dependency: transitive
description:
name: quiver
sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47
sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2
url: "https://pub.dev"
source: hosted
version: "3.2.1"
version: "3.2.2"
source_span:
dependency: transitive
description:
Expand All @@ -245,10 +245,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
Expand Down Expand Up @@ -277,10 +277,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: daadc9baabec998b062c9091525aa95786508b1c48e9c30f1f891b8bf6ff2e64
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.5.2"
version: "0.6.0"
typed_data:
dependency: transitive
description:
Expand All @@ -301,17 +301,17 @@ packages:
dependency: transitive
description:
name: yaml
sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
url: "https://pub.dev"
source: hosted
version: "3.1.2"
version: "3.1.1"
yaml_edit:
dependency: transitive
description:
name: yaml_edit
sha256: "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd"
sha256: "0b968021754d8fbd3e9c83563b538ee417d88b2cc587606da5615546b7ee033b"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.0"
sdks:
dart: ">=2.19.0 <4.0.0"
dart: ">=2.18.0 <4.0.0"

0 comments on commit 1240c6c

Please sign in to comment.