mirror of
https://github.com/nextcloud/android.git
synced 2024-12-21 08:24:08 +03:00
Merge remote-tracking branch 'origin/master' into dev
This commit is contained in:
commit
9b4d39befe
4 changed files with 607 additions and 6 deletions
|
@ -275,7 +275,7 @@ dependencies {
|
|||
implementation("androidx.compose.ui:ui")
|
||||
implementation("androidx.compose.ui:ui-graphics")
|
||||
implementation("androidx.compose.material3:material3")
|
||||
implementation("androidx.compose.ui:ui-tooling-preview:1.6.4")
|
||||
implementation("androidx.compose.ui:ui-tooling-preview:1.6.5")
|
||||
debugImplementation 'androidx.compose.ui:ui-tooling:1.6.5'
|
||||
|
||||
compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
|
||||
|
|
|
@ -858,7 +858,7 @@ Enheds legitimationsoplysninger er sat op
|
|||
<string name="update_link_forbidden_permissions">for at opdatere denne deling</string>
|
||||
<string name="updating_share_failed">Opdater deling fejlet</string>
|
||||
<string name="upload_action_failed_clear">Fjern fejlede uploads</string>
|
||||
<string name="upload_action_failed_retry">Prøv fejlede uploads igen</string>
|
||||
<string name="upload_action_failed_retry">Prøv mislykkede uploads igen</string>
|
||||
<string name="upload_cannot_create_file">Kan ikke oprette filen lokalt</string>
|
||||
<string name="upload_chooser_title">Sender fra...</string>
|
||||
<string name="upload_content_from_other_apps">Send indhold fra andre apps</string>
|
||||
|
|
|
@ -10,9 +10,9 @@
|
|||
*/
|
||||
buildscript {
|
||||
ext {
|
||||
androidLibraryVersion ="b74aee55088548deb9f596c5a34a9644db878785"
|
||||
androidPluginVersion = '8.3.1'
|
||||
androidxMediaVersion = '1.3.0'
|
||||
androidLibraryVersion ="0c886d61f6"
|
||||
androidPluginVersion = '8.3.2'
|
||||
androidxMediaVersion = '1.3.1'
|
||||
androidxTestVersion = "1.5.0"
|
||||
appCompatVersion = '1.6.1'
|
||||
checkerVersion = "3.21.2"
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue