Merge branch 'master' of github.com:OpenTails/tail_app

OpenTails · Jun 6, 2024 · d645018 · d645018
2 parents f861d28 + 3076fe5
commit d645018
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.github/actions/build_android/action.yml b/.github/actions/build_android/action.yml
@@ -42,7 +42,7 @@ runs:
         ANDROID_KEY_JKS: ${{ inputs.android-key-jks }}
     - name: Build APK
       shell: bash
-      run: flutter build apk --split-debug-info=./symbols --build-number="$BUILD_NUMBER" --build-name="$VERSION"
+      run: flutter build apk --split-debug-info=./symbols --build-number="$BUILD_NUMBER" --build-name="$VERSION" --dart-define=cronetHttpNoPlay=true
       env:
         VERSION: ${{ inputs.version }}
         BUILD_NUMBER: ${{ inputs.build-number }}
@@ -52,7 +52,7 @@ runs:
         SENTRY_URL: ${{ inputs.sentry-url }}
     - name: Build AppBundle
       shell: bash
-      run: flutter build appbundle --split-debug-info=./symbols --build-number="$BUILD_NUMBER" --build-name="$VERSION" #--dart-define=cronetHttpNoPlay=true
+      run: flutter build appbundle --split-debug-info=./symbols --build-number="$BUILD_NUMBER" --build-name="$VERSION" --dart-define=cronetHttpNoPlay=true
       env:
         VERSION: ${{ inputs.version }}
         BUILD_NUMBER: ${{ inputs.build-number }}
@@ -68,4 +68,4 @@ runs:
         name: artifact-${{ runner.os }}
         path: |
           build/app/outputs/apk
-          build/app/outputs/bundle
+          build/app/outputs/bundle
diff --git a/.run/Generate l10n.run.xml b/.run/Generate l10n.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Generate l10n" type="ShConfigurationType">
-    <option name="SCRIPT_TEXT" value="flutter gen-l10n &amp;&amp; dart run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/Frontend/intn_defs.dart lib/l10n/*.arb" />
+    <option name="SCRIPT_TEXT" value="flutter gen-l10n &amp;&amp; dart pub global run intl_translation:generate_from_arb --output-dir=lib/l10n --no-use-deferred-loading lib/Frontend/translation_string_definitions.dart lib/l10n/*.arb" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />

diff --git a/README.md b/README.md
@@ -125,8 +125,6 @@ When non EN translations are updated in [Weblate](https://weblate.codel1417.xyz/
 > To build generated `.g` files, run
 >
 > ```shell
-> dart pub global activate build_runner
-> dart pub global activate flutter_gen
 > flutter pub run build_runner build --delete-conflicting-outputs
 > ```
 

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -21,7 +21,7 @@ plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version '8.4.1' apply false
     id "org.jetbrains.kotlin.android" version "2.0.0" apply false
-    id "io.sentry.android.gradle" version "4.7.0" apply false
+    id "io.sentry.android.gradle" version "4.7.1" apply false
 }
 
 include ":app"