Upgradle AGP upto v7.0.4

cianru · Jan 1, 2022 · 4657bd2 · 4657bd2
1 parent a2c123b
commit 4657bd2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.0.0")
+        classpath("com.android.tools.build:gradle:7.0.4")
     }
 }
 
@@ -23,6 +23,12 @@ allprojects {
     }
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
 configurations.all {
     resolutionStrategy {
         eachDependency {

diff --git a/buildSrc/src/main/kotlin/ru/cian/Dependencies.kt b/buildSrc/src/main/kotlin/ru/cian/Dependencies.kt
@@ -2,8 +2,6 @@ package ru.cian
 
 object Dependencies {
 
-    const val gradle = "com.android.tools.build:gradle:7.0.0"
-
     object android {
         const val compileSdkVersion = 30
         const val targetSdkVersion  = 30
@@ -36,7 +34,7 @@ object Dependencies {
     }
 
     object gradlePlugins {
-        const val gradle = "com.android.tools.build:gradle:7.1.0-alpha10"
+        const val gradle = "com.android.tools.build:gradle:7.0.4"
     }
 
     object sample {

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -73,6 +73,12 @@ tasks.withType<Test> {
     useJUnitPlatform {}
 }
 
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
 repositories {
     google()
     mavenCentral()