Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Tobias Kaminsky 2024-03-18 03:41:33 +01:00
commit 620c7fe1cf
3 changed files with 6 additions and 2 deletions

View file

@ -1,4 +1,4 @@
FROM ubuntu:jammy
FROM ubuntu:jammy@sha256:77906da86b60585ce12215807090eb327e7386c8fafb5402369e421f44eff17e
ARG DEBIAN_FRONTEND=noninteractive
ENV ANDROID_HOME=/usr/lib/android-sdk

View file

@ -50,7 +50,7 @@ jobs:
- name: Assemble
run: |
mkdir -p "$HOME/.gradle"
echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
./gradlew assembleDebug
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7

View file

@ -39,6 +39,10 @@
<string name="appbar_search_in">在 %s 中搜索</string>
<string name="assistant_screen_all_task_type">所有</string>
<string name="assistant_screen_create_task_alert_dialog_input_field_placeholder">输入一些文字</string>
<string name="assistant_screen_delete_task_alert_dialog_description">您确定要删除这些任务吗?</string>
<string name="assistant_screen_loading">任务列表加载中,请稍等</string>
<string name="assistant_screen_task_create_success_message">任务已创建</string>
<string name="assistant_screen_task_delete_fail_message">任务已删除</string>
<string name="assistant_screen_task_view_show_less">显示更少</string>
<string name="assistant_screen_task_view_show_more">显示更多</string>
<string name="associated_account_not_found">相关账号未找到!</string>