diff --git a/.flutter b/.flutter deleted file mode 160000 index 2feea7a..0000000 --- a/.flutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2feea7a4071e25c1e3aac9c17016531bc4442f2a diff --git a/.fvmrc b/.fvmrc new file mode 100644 index 0000000..58dd5a3 --- /dev/null +++ b/.fvmrc @@ -0,0 +1,3 @@ +{ + "flutter": "3.27.0-0.1.pre" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 29a3a50..75dfa95 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 61e4ce5..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule ".flutter"] - path = .flutter - url = https://github.com/flutter/flutter.git - branch = beta diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..31c2898 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "dart.flutterSdkPath": ".fvm/versions/3.27.0-0.1.pre" +} \ No newline at end of file diff --git a/flutterw b/flutterw deleted file mode 100755 index 1326dbf..0000000 --- a/flutterw +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Flutter start up script for UN*X -## Version: v1.3.1 -## Date: 2024-05-18 18:13:42 -## -## Use this flutter wrapper to bundle Flutter within your project to make -## sure everybody builds with the same version. -## -## Read about the install and uninstall process in the README on GitHub -## https://github.com/passsy/flutter_wrapper -## -## Inspired by gradle-wrapper. -## -############################################################################## - -echoerr() { echo "$@" 1>&2; } - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ]; do - ls=$(ls -ld "$PRG") - link=$(expr "$ls" : '.*-> \(.*\)$') - if expr "$link" : '/.*' >/dev/null; then - PRG="$link" - else - PRG=$(dirname "$PRG")"/$link" - fi -done -SAVED="$(pwd)" -cd "$(dirname "$PRG")/" >/dev/null -APP_HOME="$(pwd -P)" -cd "$SAVED" >/dev/null - -FLUTTER_SUBMODULE_NAME='.flutter' -GIT_HOME=$(git -C "${APP_HOME}" rev-parse --show-toplevel) -FLUTTER_DIR="${GIT_HOME}/${FLUTTER_SUBMODULE_NAME}" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -# Fix not initialized flutter submodule -if [ ! -f "${FLUTTER_DIR}/bin/flutter" ]; then - echoerr "$FLUTTER_SUBMODULE_NAME submodule not initialized. Initializing..." - git submodule update --init "${FLUTTER_DIR}" -fi - -# Detect detach HEAD and fix it. commands like upgrade expect a valid branch, not a detached HEAD -FLUTTER_SYMBOLIC_REF=$(git -C "${FLUTTER_DIR}" symbolic-ref -q HEAD) -if [ -z "${FLUTTER_SYMBOLIC_REF}" ]; then - FLUTTER_REV=$(git -C "${FLUTTER_DIR}" rev-parse HEAD) - FLUTTER_CHANNEL=$(git -C "${GIT_HOME}" config -f .gitmodules submodule.${FLUTTER_SUBMODULE_NAME}.branch) - - if [ -z "${FLUTTER_CHANNEL}" ]; then - echoerr "Warning: Submodule '$FLUTTER_SUBMODULE_NAME' doesn't point to an official Flutter channel \ -(one of stable|beta|dev|master). './flutterw upgrade' will fail without a channel." - echoerr "Fix this by adding a specific channel with:" - echoerr " - './flutterw channel ' or" - echoerr " - Add 'branch = ' to '$FLUTTER_SUBMODULE_NAME' submodule in .gitmodules" - else - echoerr "Fixing detached HEAD: '$FLUTTER_SUBMODULE_NAME' submodule points to a specific commit $FLUTTER_REV, not channel '$FLUTTER_CHANNEL' (as defined in .gitmodules)." - # Make sure channel is fetched - # Remove old channel branch because it might be moved to an unrelated commit where fast-forward pull isn't possible - git -C "${FLUTTER_DIR}" branch -q -D "${FLUTTER_CHANNEL}" 2> /dev/null || true - git -C "${FLUTTER_DIR}" fetch -q origin - - # bind current HEAD to channel defined in .gitmodules - git -C "${FLUTTER_DIR}" checkout -q -b "${FLUTTER_CHANNEL}" "${FLUTTER_REV}" - git -C "${FLUTTER_DIR}" branch -q -u "origin/${FLUTTER_CHANNEL}" "${FLUTTER_CHANNEL}" - echoerr "Fixed! Migrated to channel '$FLUTTER_CHANNEL' while staying at commit $FLUTTER_REV. './flutterw upgrade' now works without problems!" - git -C "${FLUTTER_DIR}" status -bs - fi -fi - -# Wrapper tasks done, call flutter binary with all args -set -e -"$FLUTTER_DIR/bin/flutter" "$@" -set +e - -# Post flutterw tasks. exit code from /bin/flutterw will be used as final exit -FLUTTER_EXIT_STATUS=$? -if [ ${FLUTTER_EXIT_STATUS} -eq 0 ]; then - - # ./flutterw channel CHANNEL - if echo "$@" | grep -q "channel"; then - if [ -n "$2" ]; then - # make sure .gitmodules is updated as well - CHANNEL=${2} # second arg - git config -f "${GIT_HOME}/.gitmodules" "submodule.${FLUTTER_SUBMODULE_NAME}.branch" "${CHANNEL}" - # makes sure nobody forgets to do commit all changed files - git add "${GIT_HOME}/.gitmodules" - git add "${FLUTTER_DIR}" - fi - fi - - # ./flutterw upgrade - if echo "$@" | grep -q "upgrade"; then - # makes sure nobody forgets to do commit the changed submodule - git add "${FLUTTER_DIR}" - # flutter packages get runs automatically. Stage those changes as well - if [ -f pubspec.lock ]; then - git add pubspec.lock - fi - fi -fi - -exit ${FLUTTER_EXIT_STATUS} diff --git a/pubspec.lock b/pubspec.lock index 74684e2..ca54a4b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" + sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab" url: "https://pub.dev" source: hosted - version: "68.0.0" + version: "76.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.1.5" + version: "0.3.3" analyzer: dependency: transitive description: name: analyzer - sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" + sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e" url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.11.0" archive: dependency: transitive description: @@ -218,10 +218,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: @@ -537,18 +537,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: @@ -577,10 +577,10 @@ packages: dependency: transitive description: name: macros - sha256: a8403c89b36483b4cbf9f1fcd24562f483cb34a5c9bf101cf2b0d8a083cf1239 + sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656" url: "https://pub.dev" source: hosted - version: "0.1.0-main.5" + version: "0.1.3-main.0" matcher: dependency: transitive description: @@ -625,10 +625,10 @@ packages: dependency: transitive description: name: meta - sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.14.0" + version: "1.15.0" mime: dependency: transitive description: @@ -865,7 +865,7 @@ packages: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_gen: dependency: transitive description: @@ -918,10 +918,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: @@ -942,10 +942,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" synchronized: dependency: transitive description: @@ -966,10 +966,10 @@ packages: dependency: transitive description: name: test_api - sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" + sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.3" text_scroll: dependency: "direct main" description: @@ -1046,10 +1046,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b" + sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b url: "https://pub.dev" source: hosted - version: "14.2.2" + version: "14.3.0" watcher: dependency: transitive description: