Merge pull request #310 from owncloud/AndroidStudio-3.6.1

abelgardep · web-flow · commit 9331f7e8b36a · 2020-04-07T08:13:52.000+02:00
Android Studio 3.6.2
diff --git a/build.gradle b/build.gradle
@@ -1,15 +1,14 @@
 buildscript {
     ext {
-        // Libraries
-        kotlinVersion = '1.3.61'
+        kotlinVersion = '1.3.71'
     }
 
     repositories {
         google()
         jcenter()
     }
     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
@@ -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
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,14 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- // Libraries`
`4`		`- kotlinVersion = '1.3.61'`
	`3`	`+ kotlinVersion = '1.3.71'`
`5`	`4`	`}`
`6`	`5`
`7`	`6`	`repositories {`
`8`	`7`	`google()`
`9`	`8`	`jcenter()`
`10`	`9`	`}`
`11`	`10`	`dependencies {`
`12`		`- classpath 'com.android.tools.build:gradle:3.5.3'`
	`11`	`+ classpath 'com.android.tools.build:gradle:3.6.2'`
`13`	`12`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"`
`14`	`13`	`classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"`
`15`	`14`	`}`