From 3cff16eabb52ac33b1f8ae44a17937ab251d6d7d Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Thu, 15 Dec 2022 07:43:51 +0100 Subject: [PATCH 01/17] chore: Update webrtc --- linux/flutter/generated_plugin_registrant.cc | 4 ++++ linux/flutter/generated_plugins.cmake | 1 + pubspec.lock | 11 +++++++++-- pubspec.yaml | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 14d91e18..6badfc51 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -31,6 +32,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); + g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin"); + flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar); g_autoptr(FlPluginRegistrar) handy_window_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin"); handy_window_plugin_register_with_registrar(handy_window_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 820f9381..6ec24fd0 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -8,6 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST emoji_picker_flutter file_selector_linux flutter_secure_storage_linux + flutter_webrtc handy_window record_linux url_launcher_linux diff --git a/pubspec.lock b/pubspec.lock index aca1c084..8a1e61c7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -273,7 +273,7 @@ packages: name: dart_webrtc url: "https://pub.dartlang.org" source: hosted - version: "1.0.11" + version: "1.0.12" dbus: dependency: transitive description: @@ -685,7 +685,7 @@ packages: name: flutter_webrtc url: "https://pub.dartlang.org" source: hosted - version: "0.9.14" + version: "0.9.18" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -1230,6 +1230,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.0" + platform_detect: + dependency: transitive + description: + name: platform_detect + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.7" plugin_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1492c3a2..b4929e28 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,7 +47,7 @@ dependencies: flutter_secure_storage: ^6.0.0 flutter_typeahead: ^4.0.0 flutter_web_auth: ^0.5.0 - flutter_webrtc: 0.9.14 # Pinned because >0.9.14 add Linux support which lets build fail + flutter_webrtc: ^0.9.18 future_loading_dialog: ^0.2.3 geolocator: ^7.6.2 handy_window: ^0.1.6 From eeb966adbc81ee7b630ca3424c3d171fe6bd8db2 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Thu, 15 Dec 2022 09:11:11 +0100 Subject: [PATCH 02/17] chore: Update kotlin version --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 97900114..d9acbfd4 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.7.21' repositories { google() mavenCentral() From da5d25cde10f9db152dd8d5173192c8005b14ad9 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Thu, 15 Dec 2022 09:54:32 +0100 Subject: [PATCH 03/17] chore: Build with famedly flutter image --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d27a8ed6..f9a7a377 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: FLUTTER_VERSION: 3.3.9 -image: cirrusci/flutter:${FLUTTER_VERSION} +image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/flutter/stable:${FLUTTER_VERSION} .shared_windows_runners: tags: From b43b0008e037c71296b048e6fcdf139e6b54b679 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Thu, 15 Dec 2022 13:24:37 +0100 Subject: [PATCH 04/17] chore: Revert docker image changes --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9a7a377..d27a8ed6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: FLUTTER_VERSION: 3.3.9 -image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/flutter/stable:${FLUTTER_VERSION} +image: cirrusci/flutter:${FLUTTER_VERSION} .shared_windows_runners: tags: From 2a5a4cdaf60f0e0734b1a4570197589bd24e3c5e Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Thu, 15 Dec 2022 14:03:29 +0100 Subject: [PATCH 05/17] chore: Test build with Famedly Runners --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d27a8ed6..cc626a07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,6 +144,9 @@ build_android_apk: when: on_success paths: - build/android/app-release.apk + tags: + - docker + - famedly only: - main - tags From 12f277ea2a8334359b6d6af487cecceff6fc134d Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Thu, 15 Dec 2022 14:17:53 +0100 Subject: [PATCH 06/17] chore: Revert ci changes --- android/build.gradle | 2 +- linux/flutter/generated_plugin_registrant.cc | 4 ---- linux/flutter/generated_plugins.cmake | 1 - pubspec.lock | 11 ++--------- pubspec.yaml | 2 +- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d9acbfd4..97900114 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.21' + ext.kotlin_version = '1.6.10' repositories { google() mavenCentral() diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 6badfc51..14d91e18 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -32,9 +31,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); - g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin"); - flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar); g_autoptr(FlPluginRegistrar) handy_window_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin"); handy_window_plugin_register_with_registrar(handy_window_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 6ec24fd0..820f9381 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -8,7 +8,6 @@ list(APPEND FLUTTER_PLUGIN_LIST emoji_picker_flutter file_selector_linux flutter_secure_storage_linux - flutter_webrtc handy_window record_linux url_launcher_linux diff --git a/pubspec.lock b/pubspec.lock index 8a1e61c7..aca1c084 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -273,7 +273,7 @@ packages: name: dart_webrtc url: "https://pub.dartlang.org" source: hosted - version: "1.0.12" + version: "1.0.11" dbus: dependency: transitive description: @@ -685,7 +685,7 @@ packages: name: flutter_webrtc url: "https://pub.dartlang.org" source: hosted - version: "0.9.18" + version: "0.9.14" fuchsia_remote_debug_protocol: dependency: transitive description: flutter @@ -1230,13 +1230,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.0" - platform_detect: - dependency: transitive - description: - name: platform_detect - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.7" plugin_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b4929e28..ab17bc65 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,7 +47,7 @@ dependencies: flutter_secure_storage: ^6.0.0 flutter_typeahead: ^4.0.0 flutter_web_auth: ^0.5.0 - flutter_webrtc: ^0.9.18 + flutter_webrtc: 0.9.14 future_loading_dialog: ^0.2.3 geolocator: ^7.6.2 handy_window: ^0.1.6 From f142c600b032050f7eeb5fabb13e47b877d5eeed Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Thu, 15 Dec 2022 16:11:07 +0100 Subject: [PATCH 07/17] chore: Update webrtc --- linux/flutter/generated_plugin_registrant.cc | 4 ++++ linux/flutter/generated_plugins.cmake | 1 + pubspec.lock | 2 +- pubspec.yaml | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 14d91e18..6badfc51 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -31,6 +32,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); + g_autoptr(FlPluginRegistrar) flutter_webrtc_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterWebRTCPlugin"); + flutter_web_r_t_c_plugin_register_with_registrar(flutter_webrtc_registrar); g_autoptr(FlPluginRegistrar) handy_window_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin"); handy_window_plugin_register_with_registrar(handy_window_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 820f9381..6ec24fd0 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -8,6 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST emoji_picker_flutter file_selector_linux flutter_secure_storage_linux + flutter_webrtc handy_window record_linux url_launcher_linux diff --git a/pubspec.lock b/pubspec.lock index aca1c084..f7de8ad4 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -685,7 +685,7 @@ packages: name: flutter_webrtc url: "https://pub.dartlang.org" source: hosted - version: "0.9.14" + version: "0.9.17" fuchsia_remote_debug_protocol: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index ab17bc65..04686b21 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -47,7 +47,7 @@ dependencies: flutter_secure_storage: ^6.0.0 flutter_typeahead: ^4.0.0 flutter_web_auth: ^0.5.0 - flutter_webrtc: 0.9.14 + flutter_webrtc: 0.9.17 future_loading_dialog: ^0.2.3 geolocator: ^7.6.2 handy_window: ^0.1.6 From 4a257f5b233f62d6f088d210dbe7bb734025c028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?= Date: Wed, 14 Dec 2022 22:43:16 +0000 Subject: [PATCH 08/17] Translated using Weblate (Estonian) Currently translated at 100.0% (641 of 641 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ --- assets/l10n/intl_et.arb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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": {} + } + } } From 07b5dadceca29dc551dcfdacc73f571396013e7c Mon Sep 17 00:00:00 2001 From: Anne Onyme 017 Date: Wed, 14 Dec 2022 20:33:36 +0000 Subject: [PATCH 09/17] Translated using Weblate (French) Currently translated at 100.0% (641 of 641 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ --- assets/l10n/intl_fr.arb | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) 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": {} + } + } } From c937f4ca00800020c189591fa1b37050ca53080c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= Date: Wed, 14 Dec 2022 19:57:10 +0000 Subject: [PATCH 10/17] Translated using Weblate (Turkish) Currently translated at 100.0% (641 of 641 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/tr/ --- assets/l10n/intl_tr.arb | 7 +++++++ 1 file changed, 7 insertions(+) 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": {} + } } } From 30e8e39cd15bd66fb0cf8ad6de392b8f514f363e Mon Sep 17 00:00:00 2001 From: Ihor Hordiichuk Date: Wed, 14 Dec 2022 20:53:08 +0000 Subject: [PATCH 11/17] Translated using Weblate (Ukrainian) Currently translated at 100.0% (641 of 641 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ --- assets/l10n/intl_uk.arb | 7 +++++++ 1 file changed, 7 insertions(+) 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": {} + } } } From 203aac605b7a959529986cb58c78c0376fe9ac31 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 14 Dec 2022 08:31:56 +0000 Subject: [PATCH 12/17] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (641 of 641 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ --- assets/l10n/intl_zh.arb | 7 +++++++ 1 file changed, 7 insertions(+) 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": {} + } } } From bbf48ae798dc82eadc50f12cbc2e4f3ac9d8e4e5 Mon Sep 17 00:00:00 2001 From: Jelv Date: Wed, 14 Dec 2022 13:12:45 +0000 Subject: [PATCH 13/17] Translated using Weblate (Dutch) Currently translated at 100.0% (641 of 641 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ --- assets/l10n/intl_nl.arb | 7 +++++++ 1 file changed, 7 insertions(+) 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": {} + } } } From 0006344ff2521cbb1aa8ee98a8b7c130b5075956 Mon Sep 17 00:00:00 2001 From: Linerly Date: Wed, 14 Dec 2022 09:56:42 +0000 Subject: [PATCH 14/17] Translated using Weblate (Indonesian) Currently translated at 100.0% (641 of 641 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ --- assets/l10n/intl_id.arb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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": {} + } + } } From 2548138a0d7554bd8783d491c907cafecc335df8 Mon Sep 17 00:00:00 2001 From: Krille Date: Sat, 17 Dec 2022 07:08:51 +0000 Subject: [PATCH 15/17] chore: Use Famedly Runners --- .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc626a07..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 @@ -162,6 +180,9 @@ deploy_playstore_internal: paths: - build/android/app-release.aab resource_group: playstore_release + tags: + - docker + - famedly only: - main @@ -180,6 +201,9 @@ fdroid_repo: needs: - "build_android_apk" resource_group: playstore_release + tags: + - docker + - famedly allow_failure: true only: - main @@ -218,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: @@ -266,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+$/' From 48e10093526478ff9d44a97fabf0941670b76958 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Mon, 19 Dec 2022 10:47:52 +0100 Subject: [PATCH 16/17] chore: Bump version --- CHANGELOG.md | 5 ++++- pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) 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/pubspec.yaml b/pubspec.yaml index 04686b21..92b3177d 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" From 7d5d2cf63c709d53cc0e407bb40042a6c3f07fb1 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Mon, 19 Dec 2022 12:19:16 +0100 Subject: [PATCH 17/17] chore: Add NSLocationAlwaysAndWhenInUseUsageDescription string --- ios/Runner/Info.plist | 2 ++ 1 file changed, 2 insertions(+) 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