diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d99825cad6..fbf71aa53a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -49,7 +49,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" # See 'Supported distributions' for available options - java-version: "11" + java-version: "17" - name: Select Xcode version if: matrix.os == 'ios' diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eb70b003c3..5ec627da1b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -52,7 +52,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: "temurin" # See 'Supported distributions' for available options - java-version: "11" + java-version: "17" - name: Select Xcode version if: matrix.os == 'ios' diff --git a/scripts/build-android-apk.sh b/scripts/build-android-apk.sh index ca43acc5f2..f38c01275b 100755 --- a/scripts/build-android-apk.sh +++ b/scripts/build-android-apk.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get flutter build apk --release mkdir -p build/android cp build/app/outputs/apk/release/app-release.apk build/android/ diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh index 57f0072e03..833ff1c4cf 100755 --- a/scripts/build-linux.sh +++ b/scripts/build-linux.sh @@ -9,4 +9,5 @@ sudo apt-get install -y clang cmake ninja-build \ flutter config --enable-linux-desktop flutter clean flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get flutter build linux --release -v diff --git a/scripts/build-macos.sh b/scripts/build-macos.sh index ccc113ec7f..95ba7b5793 100755 --- a/scripts/build-macos.sh +++ b/scripts/build-macos.sh @@ -2,6 +2,7 @@ flutter config --enable-macos-desktop flutter clean flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get cd macos bundle exec fastlane sync_dev_id pod install --repo-update diff --git a/scripts/build-web.sh b/scripts/build-web.sh index 1338321493..c124a7c1b4 100755 --- a/scripts/build-web.sh +++ b/scripts/build-web.sh @@ -3,5 +3,6 @@ flutter config --enable-web flutter clean flutter pub get flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get flutter build web --release --verbose --source-maps --base-href="/web/" cp config.sample.json ./build/web/config.json diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh index 5e1ea6d12a..266c377c9d 100755 --- a/scripts/build-windows.sh +++ b/scripts/build-windows.sh @@ -3,6 +3,7 @@ echo "Building for Windows." flutter config --enable-windows-desktop flutter clean flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get flutter build windows --release -v # Building libolm diff --git a/scripts/package-windows.sh b/scripts/package-windows.sh index 22d9f1b057..a4453933f3 100755 --- a/scripts/package-windows.sh +++ b/scripts/package-windows.sh @@ -5,4 +5,5 @@ curl -OL "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" ./innosetup-6.2.2.exe //verysilent echo "Packaging." +flutter pub get flutter pub global run flutter_distributor:main.dart package --platform windows --targets exe --skip-clean --flutter-build-args="release" diff --git a/scripts/prepare-ios.sh b/scripts/prepare-ios.sh index fc43cb8167..0952b314bd 100755 --- a/scripts/prepare-ios.sh +++ b/scripts/prepare-ios.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get # Use alternate beautifier brew install xcbeautify cd ios diff --git a/scripts/release-playstore-beta.sh b/scripts/release-playstore-beta.sh index b585504182..d44bec5641 100755 --- a/scripts/release-playstore-beta.sh +++ b/scripts/release-playstore-beta.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash flutter pub get && flutter pub run build_runner build --delete-conflicting-outputs +flutter pub get flutter build appbundle --release cd android bundle exec fastlane deploy_internal_test