Fix compiler spec type mismatch

detekt · May 2, 2022 · 007dfc5 · 007dfc5
1 parent 16bbc16
commit 007dfc5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/Spec.kt b/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/Spec.kt
@@ -65,7 +65,7 @@ internal fun CliArgs.createSpec(output: Appendable, error: Appendable): Processi
         }
 
         compiler {
-            jvmTarget = args.jvmTarget.toString()
+            jvmTarget = args.jvmTarget
             languageVersion = args.languageVersion?.versionString
             classpath = args.classpath?.trim()
         }

diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/settings/EnvironmentAware.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/settings/EnvironmentAware.kt
@@ -7,7 +7,6 @@ import io.github.detekt.tooling.api.spec.ProjectSpec
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.com.intellij.openapi.Disposable
 import org.jetbrains.kotlin.com.intellij.openapi.util.Disposer
-import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.config.LanguageVersion
 import java.io.Closeable
 import java.io.File
@@ -33,7 +32,7 @@ internal class EnvironmentFacade(
             projectSpec.inputPaths.toList(),
             classpath,
             compilerSpec.parseLanguageVersion(),
-            compilerSpec.parseJvmTarget()
+            compilerSpec.jvmTarget,
         )
         createKotlinCoreEnvironment(compilerConfiguration, disposable)
     }
@@ -53,7 +52,3 @@ internal fun CompilerSpec.parseLanguageVersion(): LanguageVersion? {
     }
     return languageVersion?.let(::parse)
 }
-
-internal fun CompilerSpec.parseJvmTarget(): JvmTarget {
-    return checkNotNull(JvmTarget.fromString(jvmTarget)) { "Invalid value passed to --jvm-target" }
-}
diff --git a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/spec/CompilerSpec.kt b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/spec/CompilerSpec.kt
@@ -1,5 +1,7 @@
 package io.github.detekt.tooling.api.spec
 
+import org.jetbrains.kotlin.config.JvmTarget
+
 /**
  * All these properties are based down to the Kotlin compiler for type- and symbol resolution.
  */
@@ -8,7 +10,7 @@ interface CompilerSpec {
     /**
      * Target version for the generated JVM bytecode (e.g. 1.8, 9, 10, 11 ...).
      */
-    val jvmTarget: String
+    val jvmTarget: JvmTarget
 
     /**
      * Kotlin language version (e.g. 1.0, 1.1, 1.2, 1.3 ...).

diff --git a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/dsl/CompilerSpecBuilder.kt b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/dsl/CompilerSpecBuilder.kt
@@ -1,19 +1,20 @@
 package io.github.detekt.tooling.dsl
 
 import io.github.detekt.tooling.api.spec.CompilerSpec
+import org.jetbrains.kotlin.config.JvmTarget
 
 @ProcessingModelDsl
 class CompilerSpecBuilder : Builder<CompilerSpec> {
 
-    var jvmTarget: String = "1.8"
+    var jvmTarget: JvmTarget = JvmTarget.JVM_1_8
     var languageVersion: String? = null
     var classpath: String? = null
 
     override fun build(): CompilerSpec = CompilerModel(jvmTarget, languageVersion, classpath)
 }
 
 private data class CompilerModel(
-    override val jvmTarget: String,
+    override val jvmTarget: JvmTarget,
     override val languageVersion: String?,
     override val classpath: String?
 ) : CompilerSpec