diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index c809d5481..d89c203e4 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -12,10 +12,9 @@ jobs: - uses: webiny/action-conventional-commits@v1.3.1 - run: ./scripts/generate-locale-config.sh - run: git diff --exit-code - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Check for unused translations run: flutter pub run translations_cleaner list-unused-terms -a @@ -51,14 +50,9 @@ jobs: steps: - uses: actions/checkout@v6 - uses: ./.github/actions/free_up_space - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - - uses: actions/setup-java@v5 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: "zulu" - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - uses: moonrepo/setup-rust@v1 with: @@ -84,10 +78,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - uses: moonrepo/setup-rust@v1 - run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu @@ -109,9 +102,9 @@ jobs: runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest'}} steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - name: Install dependencies run: sudo apt-get update && sudo apt-get install git wget curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libwebkit2gtk-4.1-dev -y + - run: echo "FLUTTER_VERSION=$(yq '.environment.flutter' < pubspec.yaml)" >> $GITHUB_ENV - name: Install Flutter run: | git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git @@ -125,10 +118,9 @@ jobs: runs-on: macos-15 steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Use Xcode 16.4 run: sudo xcode-select --switch /Applications/Xcode_16.4.app @@ -202,7 +194,7 @@ jobs: echo "Generated AVD snapshot for caching." - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - uses: remarkablemark/setup-maestro-cli@v1 - name: Load integration test env diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index 4636ce7f7..d01adfc8b 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -15,10 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml - uses: moonrepo/setup-rust@v1 - run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - name: Prepare web @@ -40,14 +39,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - - uses: actions/setup-java@v5 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: 'zulu' - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Set up Ruby uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 04833a761..44f1444fa 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,10 +18,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - uses: moonrepo/setup-rust@v1 - run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu @@ -67,14 +66,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - - uses: actions/setup-java@v5 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: 'zulu' - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Add Firebase Messaging run: | @@ -107,9 +101,9 @@ jobs: runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest'}} steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - name: Install dependencies run: sudo apt-get update && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 libwebkit2gtk-4.1-dev -y + - run: echo "FLUTTER_VERSION=$(yq '.environment.flutter' < pubspec.yaml)" >> $GITHUB_ENV - name: Install Flutter run: | git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git @@ -133,14 +127,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - run: cat .github/workflows/versions.env >> $GITHUB_ENV - - uses: actions/setup-java@v5 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: 'zulu' - uses: subosito/flutter-action@v2 with: - flutter-version: ${{ env.FLUTTER_VERSION }} + flutter-version-file: pubspec.yaml cache: true - name: Set up Ruby uses: ruby/setup-ruby@v1 diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env deleted file mode 100644 index e5d1f0b2b..000000000 --- a/.github/workflows/versions.env +++ /dev/null @@ -1,2 +0,0 @@ -FLUTTER_VERSION=3.41.2 -JAVA_VERSION=17 diff --git a/pubspec.lock b/pubspec.lock index 6d30bd234..c13b217e2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -2316,4 +2316,4 @@ packages: version: "3.1.3" sdks: dart: ">=3.10.3 <4.0.0" - flutter: ">=3.38.4" + flutter: "3.41.3" diff --git a/pubspec.yaml b/pubspec.yaml index 9ecb47e91..c30bfd093 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,6 +8,7 @@ version: 2.4.0+3546 environment: sdk: ">=3.10.0 <4.0.0" + flutter: 3.41.3 dependencies: animations: ^2.1.1