mirror of
https://github.com/nextcloud/android.git
synced 2024-12-19 15:33:00 +03:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
4924834518
3 changed files with 6 additions and 5 deletions
2
.github/workflows/unit-tests.yml
vendored
2
.github/workflows/unit-tests.yml
vendored
|
@ -30,7 +30,7 @@ jobs:
|
|||
if: ${{ always() }}
|
||||
run: scripts/deleteOldComments.sh "test" "Unit" ${{github.event.number}}
|
||||
- name: Run unit tests with coverage
|
||||
uses: gradle/gradle-build-action@40b6781dcdec2762ad36556682ac74e31030cfe2 # v2.5.1
|
||||
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
|
||||
with:
|
||||
arguments: jacocoTestGplayDebugUnitTest
|
||||
- name: Upload failing results
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
/*
|
||||
* ownCloud Android client application
|
||||
*
|
||||
* @author TSI-mc
|
||||
* Copyright (C) 2016 ownCloud Inc.
|
||||
* Copyright (C) 2023 TSI-mc
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2,
|
||||
|
@ -178,7 +179,7 @@ open class FolderPickerActivity :
|
|||
if (listFragment != null) {
|
||||
if (!mSyncInProgress) {
|
||||
listFragment.setMessageForEmptyList(
|
||||
R.string.file_list_empty_headline,
|
||||
R.string.folder_list_empty_headline,
|
||||
R.string.file_list_empty_moving,
|
||||
R.drawable.ic_list_empty_create_folder,
|
||||
true
|
||||
|
|
|
@ -5,7 +5,7 @@ buildscript {
|
|||
jacoco_version = '0.8.10'
|
||||
kotlin_version = '1.8.22'
|
||||
androidxTestVersion = "1.4.0"
|
||||
daggerVersion = "2.46.1"
|
||||
daggerVersion = "2.47"
|
||||
markwonVersion = "4.6.2"
|
||||
prismVersion = "2.0.0"
|
||||
androidLibraryVersion ="1d4650805b81bb7dc057f40a4f82e02ca9121d59"
|
||||
|
@ -16,7 +16,7 @@ buildscript {
|
|||
workRuntime = "2.8.1"
|
||||
fidoVersion = "4.1.0-patch1"
|
||||
checkerVersion = "3.21.2"
|
||||
exoplayerVersion = "2.18.7"
|
||||
exoplayerVersion = "2.19.0"
|
||||
documentScannerVersion = "1.0.1"
|
||||
roomVersion = "2.5.2"
|
||||
|
||||
|
|
Loading…
Reference in a new issue