Commit edfd4dcd authored by topjohnwu's avatar topjohnwu

Fix kotlin jvmTarget

parent fb89cf13
...@@ -5,6 +5,7 @@ import org.apache.tools.ant.filters.FixCrLfFilter ...@@ -5,6 +5,7 @@ import org.apache.tools.ant.filters.FixCrLfFilter
import org.gradle.api.Action import org.gradle.api.Action
import org.gradle.api.JavaVersion import org.gradle.api.JavaVersion
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.plugins.ExtensionAware
import org.gradle.api.tasks.Delete import org.gradle.api.tasks.Delete
import org.gradle.api.tasks.StopExecutionException import org.gradle.api.tasks.StopExecutionException
import org.gradle.api.tasks.Sync import org.gradle.api.tasks.Sync
...@@ -24,8 +25,8 @@ private fun Project.androidBase(configure: Action<BaseExtension>) = ...@@ -24,8 +25,8 @@ private fun Project.androidBase(configure: Action<BaseExtension>) =
private fun Project.android(configure: Action<BaseAppModuleExtension>) = private fun Project.android(configure: Action<BaseAppModuleExtension>) =
extensions.configure("android", configure) extensions.configure("android", configure)
private fun Project.kotlinOptions(configure: Action<KotlinJvmOptions>) = private fun BaseExtension.kotlinOptions(configure: Action<KotlinJvmOptions>) =
extensions.findByName("kotlinOptions")?.let { (this as ExtensionAware).extensions.findByName("kotlinOptions")?.let {
configure.execute(it as KotlinJvmOptions) configure.execute(it as KotlinJvmOptions)
} }
...@@ -47,9 +48,10 @@ fun Project.setupCommon() { ...@@ -47,9 +48,10 @@ fun Project.setupCommon() {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11
} }
}
kotlinOptions { kotlinOptions {
jvmTarget = "11" jvmTarget = "11"
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment