Merge pull request #93 from MAGICGrants/single-flutter-version-source

Have a single source for flutter version

Author: Keeqler

.github/workflows/build-builder-image.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - 'Dockerfile.builder'
       - '.github/workflows/build-builder-image.yml'
+      - 'pubspec.yaml'
   workflow_dispatch:
 
 env:
@@ -27,6 +28,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Extract Flutter version from pubspec.yaml
+        id: flutter
+        run: |
+          FLUTTER_VERSION=$(grep -E '^\s+flutter:\s+' pubspec.yaml | head -1 | sed 's/.*flutter:\s*//')
+          echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_OUTPUT
+          echo "Using Flutter version: ${FLUTTER_VERSION}"
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -56,6 +64,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            FLUTTER_VERSION=${{ steps.flutter.outputs.FLUTTER_VERSION }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 

.github/workflows/release.yml

@@ -16,13 +16,27 @@ jobs:
     outputs:
       version: ${{ steps.version.outputs.VERSION }}
       tag: ${{ steps.version.outputs.TAG }}
+      flutter_version: ${{ steps.flutter.outputs.FLUTTER_VERSION }}
     steps:
       - name: Extract version from tag
         id: version
         run: |
           echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
           echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: pubspec.yaml
+          sparse-checkout-cone-mode: false
+
+      - name: Extract Flutter version from pubspec.yaml
+        id: flutter
+        run: |
+          FLUTTER_VERSION=$(grep -E '^\s+flutter:\s+' pubspec.yaml | head -1 | sed 's/.*flutter:\s*//')
+          echo "FLUTTER_VERSION=${FLUTTER_VERSION}" >> $GITHUB_OUTPUT
+          echo "Using Flutter version: ${FLUTTER_VERSION}"
+
   build-android:
     name: Android
     runs-on: ubuntu-latest
@@ -129,7 +143,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: 3.41.0
+          flutter-version: ${{ needs.version.outputs.flutter_version }}
 
       - name: Install dependencies
         run: flutter pub get
@@ -171,7 +185,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           channel: stable
-          flutter-version: 3.41.0
+          flutter-version: ${{ needs.version.outputs.flutter_version }}
 
       - name: Install CocoaPods
         run: brew install cocoapods

Dockerfile.builder

@@ -1,9 +1,8 @@
 # Using Debian Bullseye for maximum AppImage compatibility (GLIBC 2.31)
 FROM debian:bullseye-20251117@sha256:ee239c601913c0d3962208299eef70dcffcb7aac1787f7a02f6d3e2b518755e6
 
-ARG TARGETARCH
+ARG FLUTTER_VERSION
 
-ARG FLUTTER_VERSION=3.41.0
 ARG RUST_VERSION=1.83.0
 ARG ANDROID_CMDLINE_TOOLS_VERSION=11076708
 ARG ANDROID_BUILD_TOOLS_VERSION=36.0.0
@@ -40,7 +39,6 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* /usr/share/man/*
 
-ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-${TARGETARCH}
 ENV ANDROID_HOME=/opt/android-sdk
 ENV ANDROID_SDK_ROOT=/opt/android-sdk
 ENV CARGO_HOME=/opt/cargo

pubspec.lock

@@ -1142,4 +1142,4 @@ packages:
     version: "3.1.3"
 sdks:
   dart: "3.11.0"
-  flutter: ">=3.35.0"
+  flutter: "3.41.0"

pubspec.yaml

@@ -20,6 +20,7 @@ version: 1.0.8+14
 
 environment:
   sdk: 3.11.0
+  flutter: 3.41.0
 
 flutter_launcher_icons:
   android: true