From 29fab669e9cc36a84c27f8a011d0618d7375be1c Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Thu, 5 Mar 2020 07:38:27 +0100
Subject: [PATCH 1/3] update Kotlin

---
 build.gradle                | 2 +-
 owncloudDomain/.gitignore   | 1 -
 owncloudTestUtil/.gitignore | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 owncloudDomain/.gitignore
 delete mode 100644 owncloudTestUtil/.gitignore

diff --git a/build.gradle b/build.gradle
index 63f15e56590..883b9b6eb7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
         biometricVersion="1.0.1"
 
         // Kotlin
-        kotlinVersion = "1.3.61"
+        kotlinVersion = "1.3.71"
         coroutinesVersion = "1.3.2"
 
         // Koin
diff --git a/owncloudDomain/.gitignore b/owncloudDomain/.gitignore
deleted file mode 100644
index 796b96d1c40..00000000000
--- a/owncloudDomain/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/owncloudTestUtil/.gitignore b/owncloudTestUtil/.gitignore
deleted file mode 100644
index 796b96d1c40..00000000000
--- a/owncloudTestUtil/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build

From dc00ad55aaa4076e262acde24d0fde6085209c44 Mon Sep 17 00:00:00 2001
From: Hannes Achleitner <hannes.software@gmx.at>
Date: Thu, 5 Mar 2020 07:28:45 +0100
Subject: [PATCH 2/3] Android Studio 3.6.2

---
 .idea/codeStyles/Project.xml             | 3 ---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 04083ab7954..9799f9efdfc 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -2,9 +2,6 @@
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
     <option name="RIGHT_MARGIN" value="120" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
       <option name="FIELD_NAME_PREFIX" value="m" />
       <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
diff --git a/build.gradle b/build.gradle
index 883b9b6eb7f..84f021a4868 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c6d1d3ea6bb..01c8b822b94 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
\ No newline at end of file

From 9ee52d013cfc6a80310cc7e7a2ffe69420c012f4 Mon Sep 17 00:00:00 2001
From: agarcia <agarcia@solidgeargroup.com>
Date: Mon, 6 Apr 2020 09:08:13 +0200
Subject: [PATCH 3/3] Fix lint error and update library reference

---
 owncloud-android-library                       | 2 +-
 owncloudApp/src/main/res/values-da/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/owncloud-android-library b/owncloud-android-library
index 2984c29ea9c..48f720011d5 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 2984c29ea9c5e33cee797efa0eba72fea48f2d22
+Subproject commit 48f720011d5d0b4f4e36d7fe48c07a29a2395f60
diff --git a/owncloudApp/src/main/res/values-da/strings.xml b/owncloudApp/src/main/res/values-da/strings.xml
index 6e98418eae3..3780ffb1ccf 100644
--- a/owncloudApp/src/main/res/values-da/strings.xml
+++ b/owncloudApp/src/main/res/values-da/strings.xml
@@ -197,7 +197,7 @@
   <string name="media_err_timeout">Tiden udløb under forsøg på at afspille</string>
   <string name="media_err_invalid_progressive_playback">Mediefilen kan ikke streames</string>
   <string name="media_err_unknown">Mediefil kan ikke afspilles med tilgængelige medieafspiller</string>
-  <string name="media_err_security_ex">Sikkerhedsfejl ved forsøg på afspilning af </string>
+  <string name="media_err_security_ex">Sikkerhedsfejl ved forsøg på afspilning af %1$s</string>
   <string name="media_err_io_ex">Inputfejl ved forsøg på afspilning af %1$s</string>
   <string name="media_err_unexpected">Uventet fejl ved forsøg på afspilning af %1$s</string>
   <string name="media_rewind_description">Tilbagespolingsknap</string>