Merge pull request #415 from owncloud/bump_kotlin_gradle

abelgardep · web-flow · commit 022c486603ca · 2021-07-02T13:07:53.000+02:00
Bump kotlin to 1.5.20
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlinVersion = '1.5.10'
+        kotlinVersion = '1.5.20'
         moshiVersion = "1.12.0"
     }
 
@@ -11,7 +11,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`ext {`
`3`		`- kotlinVersion = '1.5.10'`
	`3`	`+ kotlinVersion = '1.5.20'`
`4`	`4`	`moshiVersion = "1.12.0"`
`5`	`5`	`}`
`6`	`6`
`@@ -11,7 +11,7 @@ buildscript {`
`11`	`11`	`}`
`12`	`12`	`dependencies {`
`13`	`13`	`classpath "org.jlleitschuh.gradle:ktlint-gradle:10.1.0"`
`14`		`- classpath 'com.android.tools.build:gradle:4.2.1'`
	`14`	`+ classpath 'com.android.tools.build:gradle:4.2.2'`
`15`	`15`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"`
`16`	`16`	`}`
`17`	`17`	`}`