Ensure Android Java and Kotlin compile to the same version
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
// Gradle build config for Godot Engine's Android port.
|
||||
apply from: 'config.gradle'
|
||||
|
||||
buildscript {
|
||||
apply from: 'config.gradle'
|
||||
|
||||
@@ -14,7 +12,12 @@ buildscript {
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'com.android.application'
|
||||
plugins {
|
||||
id 'com.android.application'
|
||||
id 'org.jetbrains.kotlin.android'
|
||||
}
|
||||
|
||||
apply from: 'config.gradle'
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
@@ -79,6 +82,10 @@ android {
|
||||
targetCompatibility versions.javaVersion
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = versions.javaVersion
|
||||
}
|
||||
|
||||
assetPacks = [":assetPacks:installTime"]
|
||||
|
||||
defaultConfig {
|
||||
|
||||
Reference in New Issue
Block a user