From 72cc925a51bf606de2b83c9d059251b53be948e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Sep 2022 01:33:40 +0000 Subject: [PATCH 1/7] Bump json from 20220320 to 20220924 Bumps [json](https://github.com/douglascrockford/JSON-java) from 20220320 to 20220924. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index afa2653cc1..c7f0e3cabd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -307,7 +307,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' testImplementation "org.mockito:mockito-core:$mockitoVersion" testImplementation "androidx.test:core:$androidxTestVersion" - testImplementation 'org.json:json:20220320' + testImplementation 'org.json:json:20220924' testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation 'androidx.arch.core:core-testing:2.1.0' testImplementation "io.mockk:mockk:$mockkVersion" From ca63eff03508b98745633da5375ba2f002f2d3f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 01:05:09 +0000 Subject: [PATCH 2/7] Bump mockkVersion from 1.12.5 to 1.13.2 Bumps `mockkVersion` from 1.12.5 to 1.13.2. Updates `mockk` from 1.12.5 to 1.13.2 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.12.5...1.13.2) Updates `mockk-android` from 1.12.5 to 1.13.2 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.12.5...1.13.2) --- updated-dependencies: - dependency-name: io.mockk:mockk dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.mockk:mockk-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c08355abfa..067f32132b 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { androidLibraryVersion = "master-SNAPSHOT" mockitoVersion = "4.8.0" mockitoKotlinVersion = "4.0.0" - mockkVersion = "1.12.5" + mockkVersion = "1.13.2" espressoVersion = "3.4.0" workRuntime = "2.7.1" fidoVersion = "4.1.0" From 4d700100c2273f6953bdf845f181b043e2ca62c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Sep 2022 01:05:19 +0000 Subject: [PATCH 3/7] Bump bcpkix-jdk15to18 from 1.70 to 1.72 Bumps [bcpkix-jdk15to18](https://github.com/bcgit/bc-java) from 1.70 to 1.72. - [Release notes](https://github.com/bcgit/bc-java/releases) - [Changelog](https://github.com/bcgit/bc-java/blob/master/docs/releasenotes.html) - [Commits](https://github.com/bcgit/bc-java/commits) --- updated-dependencies: - dependency-name: org.bouncycastle:bcpkix-jdk15to18 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index afa2653cc1..d0698e6153 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -240,7 +240,7 @@ dependencies { implementation 'org.greenrobot:eventbus:3.3.1' implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3' implementation 'org.lukhnos:nnio:0.2' - implementation 'org.bouncycastle:bcpkix-jdk15to18:1.70' + implementation 'org.bouncycastle:bcpkix-jdk15to18:1.72' implementation 'com.google.code.gson:gson:2.9.1' implementation 'com.github.nextcloud-deps:sectioned-recyclerview:0.6.1' implementation 'com.github.chrisbanes:PhotoView:2.3.0' From e2c149cbe6cfe263fbd6431c7092e8ac0137df58 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Thu, 29 Sep 2022 04:36:51 +0000 Subject: [PATCH 4/7] [tx-robot] updated from transifex Signed-off-by: Nextcloud bot --- app/src/main/res/values-sl/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 8c7cb621fd..ff35ffb5cb 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -88,6 +88,7 @@ Dnevnik razvojne različice Izbirno polje Izberi krajevno mapo… + Izberi mesto Izberi oddaljeno mapo… Izbrati je treba predlogo in vpisati ime datoteke. Izberite, katero datoteko želite obdržati! From 0d8527ea5b409bf5cdc85495b70dbdcd6e5baab2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 01:08:30 +0000 Subject: [PATCH 5/7] Bump kotlin_version from 1.7.10 to 1.7.20 Bumps `kotlin_version` from 1.7.10 to 1.7.20. Updates `kotlin-gradle-plugin` from 1.7.10 to 1.7.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) Updates `kotlin-stdlib` from 1.7.10 to 1.7.20 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.7.20/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.10...v1.7.20) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c08355abfa..3198bb07d0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { jacoco_version = '0.8.8' - kotlin_version = '1.7.10' + kotlin_version = '1.7.20' androidxTestVersion = "1.4.0" daggerVersion = "2.44" markwonVersion = "4.6.2" From 6033c19df42256621f9893a57446df7e3cbccac3 Mon Sep 17 00:00:00 2001 From: Nextcloud bot Date: Fri, 30 Sep 2022 05:46:13 +0000 Subject: [PATCH 6/7] [tx-robot] updated from transifex Signed-off-by: Nextcloud bot --- app/src/main/res/values-nl/strings.xml | 27 +++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 97a94d9063..0882324f23 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -14,7 +14,7 @@ Versturen/Delen Rasterindeling Lijstindeling - Herstellen contacten & agenda + Herstel contacten & agenda Kopiëren Nieuwe map Verplaatsen @@ -89,6 +89,7 @@ Changelog dev versie Aanvinkvakje Kies lokale map… + Kies locatie Kies externe map… Kies een sjabloon en geen een bestandsnaam op. Kies welk bestand bewaard moet blijven! @@ -293,6 +294,7 @@ Kon UI niet bijwerken Toevoegen aan favorieten Favoriet + Bestandsnaam bestaat al Verwijderen Fout bij ophalen activiteiten van bestand Kon details niet laden @@ -404,6 +406,7 @@ Het bestand is niet te vinden binnen het lokale bestandssysteem. %1$s/%2$s Er zijn niet meer mappen. + Kies map Vervalt: %1$s Vergrendel bestand Vergrendeld door %1$s @@ -610,6 +613,7 @@ Sync met DAVx5 Fout bij het ophalen van de zoekresultaten Alles selecteren + Selecteer mediamap Selecteer een sjabloon Kies sjabloon Versturen @@ -664,6 +668,8 @@ gedeeld via link Gedeeld met u door %1$s Toevoegen ontvanger mislukt + Toon foto\'s + Toon video\'s Aanmelden bij provider Toestaan dat%1$s je Nextcloud account %2$sbenadert? Sorteer op @@ -720,6 +726,9 @@ Strict modus: geen HTTP-verbinding toegestaan! \"%1$s\" is met je gedeeld %1$s deelde \"%2$s\" met jou + Enkel foto\'s + Foto\'s & video\'s + Enkel video\'s Stel voor Conflicten gevonden Map %1$s bestaat niet meer @@ -895,6 +904,22 @@ %d dubbel invoer gevonden %d dubbele waarden gevonden + + %d bestand geëxporteerd + %d bestanden geëxporteerd + + + Kon %d bestand niet exporteren + Kon %d bestanden niet exporteren + + + %d bestand geëxporteerd, rest overgeslagen door fout + %d bestanden geëxporteerd, rest overgeslagen door fout + + + %d bestand wordt geëxporteerd. Zie melding voor details. + %d bestanden worden geëxporteerd. Zie melding voor details. + %1$d mappen %1$d mappen From 6c217cffa622fa2e34f031aa16bae6d8b3fd49c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Fri, 30 Sep 2022 10:00:24 +0200 Subject: [PATCH 7/7] Update packagingOptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Álvaro Brey --- app/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index afa2653cc1..ccfbd77771 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -156,7 +156,8 @@ android { // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure packagingOptions { resources { - excludes += ['META-INF/LICENSE.txt', 'META-INF/LICENSE'] + excludes += 'META-INF/LICENSE*' + pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies } }