diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d27a8ed6..334d43b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,16 @@ code_analyze: artifacts: reports: codequality: code-quality-report.json + tags: + - docker + - famedly widget_test: stage: test script: [flutter test] + tags: + - docker + - famedly # the basic integration test configuration testing FLOSS builds on Synapse .integration_test: @@ -62,6 +68,9 @@ widget_test: - flutter pub get - flutter test integration_test timeout: 20m + tags: + - docker + - famedly # integration tests for Linux builds @@ -99,6 +108,9 @@ widget_test: # generate temporary release build configuration and ensure app launches - scripts/integration-check-release-build.sh timeout: 20m + tags: + - docker + - famedly build_web: stage: build @@ -108,6 +120,9 @@ build_web: artifacts: paths: - build/web/ + tags: + - docker + - famedly build_windows: extends: @@ -133,6 +148,9 @@ build_android_debug: except: - main - tags + tags: + - docker + - famedly build_android_apk: stage: build @@ -144,6 +162,9 @@ build_android_apk: when: on_success paths: - build/android/app-release.apk + tags: + - docker + - famedly only: - main - tags @@ -159,6 +180,9 @@ deploy_playstore_internal: paths: - build/android/app-release.aab resource_group: playstore_release + tags: + - docker + - famedly only: - main @@ -177,6 +201,9 @@ fdroid_repo: needs: - "build_android_apk" resource_group: playstore_release + tags: + - docker + - famedly allow_failure: true only: - main @@ -215,6 +242,9 @@ build_linux_x86: sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && 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 -y, ] script: [./scripts/build-linux.sh] + tags: + - docker + - famedly artifacts: when: on_success paths: @@ -263,6 +293,9 @@ update_dependencies: .release: stage: deploy image: curlimages/curl:latest + tags: + - docker + - famedly rules: - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/' - if: '$CI_COMMIT_TAG =~ /^rc\d+\.\d+\.\d+-\d+$/' diff --git a/CHANGELOG.md b/CHANGELOG.md index 548c1fa6..61477c7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -## v1.7.1 2022 11-23 +## v1.7.2 2022-12-19 +Update dependencies and translations. + +## v1.7.1 2022-11-23 Minor bugfix release to retrigger build for FlatPak and Android. Fixes some style bugs and updates some translations ## v1.7.0 2022-11-17 diff --git a/assets/l10n/intl_et.arb b/assets/l10n/intl_et.arb index a7dd8c10..0c2b3579 100644 --- a/assets/l10n/intl_et.arb +++ b/assets/l10n/intl_et.arb @@ -3018,5 +3018,12 @@ } }, "commandHint_googly": "Saada ühed otsivad silmad", - "@commandHint_googly": {} + "@commandHint_googly": {}, + "wasDirectChatDisplayName": "Sõnumiteta vestlus (vana nimega {oldDisplayName})", + "@wasDirectChatDisplayName": { + "type": "text", + "placeholders": { + "oldDisplayName": {} + } + } } diff --git a/assets/l10n/intl_fr.arb b/assets/l10n/intl_fr.arb index cdb84e98..3ddf6f4c 100644 --- a/assets/l10n/intl_fr.arb +++ b/assets/l10n/intl_fr.arb @@ -2991,5 +2991,39 @@ "hideUnimportantStateEvents": "Masquer les événements d'état sans importance", "@hideUnimportantStateEvents": {}, "doNotShowAgain": "Ne plus afficher", - "@doNotShowAgain": {} + "@doNotShowAgain": {}, + "commandHint_googly": "Envoyer des yeux écarquillés", + "@commandHint_googly": {}, + "commandHint_cuddle": "Envoyer un câlin", + "@commandHint_cuddle": {}, + "commandHint_hug": "Envoyer une accolade", + "@commandHint_hug": {}, + "googlyEyesContent": "{senderName} vous envoie des yeux écarquillés", + "@googlyEyesContent": { + "type": "text", + "placeholders": { + "senderName": {} + } + }, + "cuddleContent": "{senderName} vous fait un câlin", + "@cuddleContent": { + "type": "text", + "placeholders": { + "senderName": {} + } + }, + "hugContent": "{senderName} vous fait une accolade", + "@hugContent": { + "type": "text", + "placeholders": { + "senderName": {} + } + }, + "wasDirectChatDisplayName": "Discussion vide (était {oldDisplayName})", + "@wasDirectChatDisplayName": { + "type": "text", + "placeholders": { + "oldDisplayName": {} + } + } } diff --git a/assets/l10n/intl_id.arb b/assets/l10n/intl_id.arb index a8de49f5..073054b8 100644 --- a/assets/l10n/intl_id.arb +++ b/assets/l10n/intl_id.arb @@ -3012,5 +3012,12 @@ "commandHint_hug": "Kirim pelukan", "@commandHint_hug": {}, "commandHint_cuddle": "Kirim berpelukan", - "@commandHint_cuddle": {} + "@commandHint_cuddle": {}, + "wasDirectChatDisplayName": "Obrolan kosong (sebelumnya {oldDisplayName})", + "@wasDirectChatDisplayName": { + "type": "text", + "placeholders": { + "oldDisplayName": {} + } + } } diff --git a/assets/l10n/intl_nl.arb b/assets/l10n/intl_nl.arb index ba7df5c4..ab06bee0 100644 --- a/assets/l10n/intl_nl.arb +++ b/assets/l10n/intl_nl.arb @@ -3017,5 +3017,12 @@ "placeholders": { "senderName": {} } + }, + "wasDirectChatDisplayName": "Lege chat (was {oldDisplayName})", + "@wasDirectChatDisplayName": { + "type": "text", + "placeholders": { + "oldDisplayName": {} + } } } diff --git a/assets/l10n/intl_tr.arb b/assets/l10n/intl_tr.arb index 54ea3219..d8c6bcc0 100644 --- a/assets/l10n/intl_tr.arb +++ b/assets/l10n/intl_tr.arb @@ -3018,5 +3018,12 @@ "placeholders": { "senderName": {} } + }, + "wasDirectChatDisplayName": "Boş sohbet ({oldDisplayName} idi)", + "@wasDirectChatDisplayName": { + "type": "text", + "placeholders": { + "oldDisplayName": {} + } } } diff --git a/assets/l10n/intl_uk.arb b/assets/l10n/intl_uk.arb index 36fb645b..72527be0 100644 --- a/assets/l10n/intl_uk.arb +++ b/assets/l10n/intl_uk.arb @@ -3013,5 +3013,12 @@ "placeholders": { "senderName": {} } + }, + "wasDirectChatDisplayName": "Порожня бесіда (раніше {oldDisplayName})", + "@wasDirectChatDisplayName": { + "type": "text", + "placeholders": { + "oldDisplayName": {} + } } } diff --git a/assets/l10n/intl_zh.arb b/assets/l10n/intl_zh.arb index 2ae0dfa2..b0b7226a 100644 --- a/assets/l10n/intl_zh.arb +++ b/assets/l10n/intl_zh.arb @@ -3018,5 +3018,12 @@ "placeholders": { "senderName": {} } + }, + "wasDirectChatDisplayName": "空聊天(曾是 {oldDisplayName})", + "@wasDirectChatDisplayName": { + "type": "text", + "placeholders": { + "oldDisplayName": {} + } } } diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 559712db..dfb6129b 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -63,6 +63,8 @@ Share your location with your contacts in FluffyChat. NSLocationWhenInUseUsageDescription Share your location with your contacts in FluffyChat. + NSLocationAlwaysAndWhenInUseUsageDescription + Share your location with your contacts in FluffyChat. NSMicrophoneUsageDescription Record voice message and share them with your contacts on FluffyChat. NSMotionUsageDescription diff --git a/pubspec.yaml b/pubspec.yaml index 6751123c..30289759 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: fluffychat description: Chat with your friends. publish_to: none -version: 1.7.1+2329 +version: 1.7.2+2330 environment: sdk: ">=2.12.0 <3.0.0"