Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit 856d4c3

Browse files
committed
AGP 7.0.0-beta01,JavaVersion 11
1 parent 1ede62f commit 856d4c3

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

buildSrc/src/main/kotlin/Extensions.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.android.build.gradle.LibraryExtension
66
import com.android.build.gradle.internal.api.ApkVariantOutputImpl
77
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
88
import org.gradle.api.InvalidUserDataException
9+
import org.gradle.api.JavaVersion
910
import org.gradle.api.Project
1011
import org.gradle.api.artifacts.Dependency
1112
import org.gradle.api.artifacts.dsl.DependencyHandler
@@ -114,7 +115,12 @@ inline fun <reified T : BaseExtension> Project.setupBase(
114115
}
115116
}
116117
buildFeatures.buildConfig = false
118+
compileOptions {
119+
sourceCompatibility = JavaVersion.VERSION_11
120+
targetCompatibility = JavaVersion.VERSION_11
121+
}
117122
kotlinOptions {
123+
jvmTarget = JavaVersion.VERSION_11.toString()
118124
freeCompilerArgs = listOf(
119125
"-Xjvm-default=all-compatibility"
120126
)

gradle/extra.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import java.nio.charset.StandardCharsets
22
import java.util.concurrent.TimeUnit
33

44
ext {
5-
androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha15"
5+
androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta01"
66
kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
77
}
88

gradle/extra.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import java.nio.charset.StandardCharsets
22
import java.util.concurrent.TimeUnit
33

44
rootProject.extra.run {
5-
set("androidGradlePlugin", "com.android.tools.build:gradle:7.0.0-alpha15")
6-
set("kotlinPlugin", "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32")
5+
set("androidGradlePlugin", "com.android.tools.build:gradle:4.2.1")
6+
set("kotlinPlugin", "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0")
77
}
88

99
repositories {

0 commit comments

Comments
 (0)