From f9401ba1fade1400344d11cc89c85dd1144a84bd Mon Sep 17 00:00:00 2001
From: tzugen <tzugen@riseup.net>
Date: Mon, 24 May 2021 12:04:18 +0200
Subject: [PATCH] Apply JVM Target to all Kotlin tasks

---
 build.gradle                                   | 7 +++++++
 gradle_scripts/android-module-bootstrap.gradle | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 597d384a..d6d7c22f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,6 +35,13 @@ allprojects {
         google()
         maven { url 'https://jitpack.io' }
     }
+
+    // Set Kotlin JVM target to the same for all subprojects
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
+    }
 }
 
 apply from: 'gradle_scripts/jacoco.gradle'
diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle
index f9fa091a..847827e7 100644
--- a/gradle_scripts/android-module-bootstrap.gradle
+++ b/gradle_scripts/android-module-bootstrap.gradle
@@ -13,10 +13,6 @@ android {
         targetSdkVersion versions.targetSdk
     }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
     compileOptions {
         // Sets Java compatibility to Java 8
         sourceCompatibility JavaVersion.VERSION_1_8