Merge pull request #900 from aSemy/fix/jvm_target_1_8

Standardise JVM target to be 1.8
mockk · Aug 25, 2022 · cee570d · cee570d
2 parents fe36b92 + 7d48dad
commit cee570d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt b/buildSrc/src/main/kotlin/buildsrc/config/Deps.kt
@@ -1,11 +1,14 @@
 package buildsrc.config
 
+import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 
 fun Project.kotlinVersion() = findProperty("kotlin.version")?.toString() ?: Deps.Versions.kotlinDefault
 
 object Deps {
     object Versions {
+        val jvmTarget = JavaVersion.VERSION_1_8
+
         const val androidTools = "7.2.1"
         const val dokka = "1.7.10"
         const val kotlinDefault = "1.7.10"

diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/android-application.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/android-application.gradle.kts
@@ -1,5 +1,6 @@
 package buildsrc.convention
 
+import buildsrc.config.Deps
 import org.gradle.jvm.tasks.Jar
 
 plugins {
@@ -18,7 +19,7 @@ android {
     compileSdkVersion = "android-32"
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = Deps.Versions.jvmTarget.toString()
     }
 
     lint {
@@ -39,8 +40,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = Deps.Versions.jvmTarget
+        targetCompatibility = Deps.Versions.jvmTarget
     }
 }
 

diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/android-library.gradle.kts
@@ -1,5 +1,7 @@
 package buildsrc.convention
 
+import buildsrc.config.Deps
+
 plugins {
     id("com.android.library")
 
@@ -16,7 +18,7 @@ android {
     compileSdkVersion = "android-32"
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = Deps.Versions.jvmTarget.toString()
     }
 
     lint {
@@ -37,8 +39,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = Deps.Versions.jvmTarget
+        targetCompatibility = Deps.Versions.jvmTarget
     }
 }
 

diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-jvm.gradle.kts
@@ -1,5 +1,6 @@
 package buildsrc.convention
 
+import buildsrc.config.Deps
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -25,6 +26,7 @@ tasks.withType<JavaCompile>().configureEach {
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.apply {
         freeCompilerArgs += listOf("-Xjsr305=strict")
+        jvmTarget = Deps.Versions.jvmTarget.toString()
         apiVersion = "1.5"
         languageVersion = "1.7"
     }

diff --git a/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/convention/kotlin-multiplatform.gradle.kts
@@ -1,5 +1,6 @@
 package buildsrc.convention
 
+import buildsrc.config.Deps
 import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
 
 plugins {
@@ -21,6 +22,11 @@ kotlin {
         }
     }
     targets.withType<KotlinJvmTarget>().configureEach {
+        compilations.configureEach {
+            kotlinOptions {
+                jvmTarget = Deps.Versions.jvmTarget.toString()
+            }
+        }
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
         }