Merge pull request #7083 from nextcloud/AS41

Update to Android Studio 4.1
nextcloud · Oct 13, 2020 · 2696df8 · 2696df8
2 parents b2370c9 + 1ca8136
commit 2696df8
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath('com.hiya:jacoco-android:0.2')
         classpath 'gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 29 07:39:21 CEST 2020
+#Tue Oct 13 09:09:22 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/...com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFiles.png b/...com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFiles.png
diff --git a/...loud.android.ui.fragment.OCFileListFragmentStaticServerIT_showRichWorkspace.png b/...loud.android.ui.fragment.OCFileListFragmentStaticServerIT_showRichWorkspace.png
diff --git a/...ncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showSharedFiles.png b/...ncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showSharedFiles.png
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 76 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 356 warnings</span>