summaryrefslogtreecommitdiff
path: root/platform/android/java/nativeSrcsConfigs
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-06-01 18:31:09 +0200
committerGitHub <noreply@github.com>2022-06-01 18:31:09 +0200
commitcd7871867faae0d1aa4c2bf5cd6dae8ea8f4237c (patch)
tree3c598fd26e3f86994fcf592e173576bd9eeef962 /platform/android/java/nativeSrcsConfigs
parent79aa13ac7ed65c6fed47509e50e328db219bb5b8 (diff)
parentb19bbadcf0b196914e355a96bc3b96dc75bfaa5b (diff)
Merge pull request #61579 from madmiraal/android-kotlin-java-version
Ensure Android Java and Kotlin compile to the same version
Diffstat (limited to 'platform/android/java/nativeSrcsConfigs')
-rw-r--r--platform/android/java/nativeSrcsConfigs/build.gradle5
1 files changed, 5 insertions, 0 deletions
diff --git a/platform/android/java/nativeSrcsConfigs/build.gradle b/platform/android/java/nativeSrcsConfigs/build.gradle
index 0cb769b539..5e810ae1ba 100644
--- a/platform/android/java/nativeSrcsConfigs/build.gradle
+++ b/platform/android/java/nativeSrcsConfigs/build.gradle
@@ -1,6 +1,7 @@
// Non functional android library used to provide Android Studio editor support to the project.
plugins {
id 'com.android.library'
+ id 'org.jetbrains.kotlin.android'
}
android {
@@ -18,6 +19,10 @@ android {
targetCompatibility versions.javaVersion
}
+ kotlinOptions {
+ jvmTarget = versions.javaVersion
+ }
+
packagingOptions {
exclude 'META-INF/LICENSE'
exclude 'META-INF/NOTICE'