Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.44.2"
"flutter": "3.44.9"
}
2 changes: 1 addition & 1 deletion .github/actions/flutter-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ runs:
- name: Install FVM
shell: bash
run: |
curl -fsSL https://fvm.app/install.sh | bash -s -- 4.1.1
curl -fsSL https://fvm.app/install.sh | bash -s -- 4.1.2
echo "$HOME/fvm/bin" >> $GITHUB_PATH

- name: Check Flutter version
Expand Down
19 changes: 14 additions & 5 deletions .github/workflows/upload-app-store-connect.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,13 @@ jobs:

# Install the pinned native FVM binary without executing the mutable
# fvm.app installer script on a runner that later receives signing keys.
- name: Install FVM 4.1.1
- name: Install FVM 4.1.2
run: |
archive="$RUNNER_TEMP/fvm-4.1.1-macos-arm64.tar.gz"
archive="$RUNNER_TEMP/fvm-4.1.2-macos-arm64.tar.gz"
curl -fsSL \
https://github.com/conceptadev/fvm/releases/download/4.1.1/fvm-4.1.1-macos-arm64.tar.gz \
https://github.com/leoafarias/fvm/releases/download/4.1.2/fvm-4.1.2-macos-arm64.tar.gz \
-o "$archive"
echo "ffbcc64c227b33046b0b3aee0829466a8900a3c85d976c7f8449220c0730aad9 $archive" \
echo "0b2a146986c51f06331f135f0bdf2a202eb57f55d7edd420c9078e8520e4c033 $archive" \
| shasum -a 256 -c -
mkdir -p "$HOME/fvm/bin"
tar -xzf "$archive" -C "$HOME/fvm/bin" --strip-components=1 fvm/fvm
Expand Down Expand Up @@ -183,7 +183,16 @@ jobs:
working-directory: ios
run: |
test -f Podfile.lock
pod install --deployment
# The image's CocoaPods floats (1.16 -> 1.17 changed podspec checksums,
# which `--deployment` rejects). Pin to whatever generated Podfile.lock
# so the lockfile stays the single source of truth across image bumps.
locked_version="$(awk '/^COCOAPODS:/ { print $2; exit }' Podfile.lock)"
test -n "$locked_version"
if [ "$(pod --version)" != "$locked_version" ]; then
sudo gem install cocoapods -v "$locked_version" --no-document
fi
test "$(pod "_${locked_version}_" --version)" = "$locked_version"
pod "_${locked_version}_" install --deployment

- name: Import App Store distribution certificate
uses: apple-actions/import-codesign-certs@5142e029c445c10ffc7149d172e540235a065466 # v7.0.0
Expand Down
6 changes: 3 additions & 3 deletions Containerfile.tools
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ ENV USER=$USERNAME
# android/gradle.properties); the FVM CI install pins FVM separately. Keep these
# defaults in sync with .fvmrc / android/gradle.properties so the dev container
# and the reproducible release build never diverge on toolchain versions.
ARG FVM_VERSION="4.1.1"
ARG FLUTTER_VERSION="3.44.2"
ARG FVM_VERSION="4.1.2"
ARG FLUTTER_VERSION="3.44.9"
ARG ANDROID_CMDLINE_TOOLS_VERSION="14742923"

# Rust is pinned explicitly via RUST_VERSION. RUSTUP_TOOLCHAIN env (set below)
Expand Down Expand Up @@ -191,7 +191,7 @@ RUN if [ -n "$EXPECTED_RUST_VERSION" ]; then \
# what install.sh produces — it copies the contents of the archive's fvm/
# directory into ${INSTALL_BASE}/bin, which is the directory added to PATH.
# Refresh: sha256sum of the linux-x64 asset on the FVM release for this version.
ARG FVM_SHA256="2d7fdfc3e77591806efe38fab23098a79567a89a9570de713c43f30cc54348d7"
ARG FVM_SHA256="12b0656688450972750cb714fc5e44ed2dbdd6b1c6813ba6ba6fb71841c17fe4"
RUN curl -fsSL \
https://github.com/leoafarias/fvm/releases/download/${FVM_VERSION}/fvm-${FVM_VERSION}-linux-x64.tar.gz \
-o /tmp/fvm.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: b9aa080c2a42d4d61d216015adddd3850778d844

COCOAPODS: 1.16.2
COCOAPODS: 1.17.0
2 changes: 1 addition & 1 deletion packages/bull_ui/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resolution: workspace

environment:
sdk: "3.12.2"
flutter: "3.44.2"
flutter: "3.44.9"

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion packages/bull_ui_catalogue/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resolution: workspace

environment:
sdk: "3.12.2"
flutter: "3.44.2"
flutter: "3.44.9"

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2402,4 +2402,4 @@ packages:
version: "2.2.4"
sdks:
dart: "3.12.2"
flutter: "3.44.2"
flutter: "3.44.9"
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: 6.13.0+200

environment:
sdk: "3.12.2"
flutter: "3.44.2"
flutter: "3.44.9"
workspace:
- packages/bull_payjoin
- packages/bull_ui
Expand Down
Loading