Skip to content

Commit da035df

Browse files
Merge pull request #1325 from square/sedwards/fix-pom
Specify Kotlin version explicitly, for POM
2 parents c958667 + 783c58c commit da035df

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

build-logic/src/main/java/com/squareup/workflow1/buildsrc/KotlinCommonSettings.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,27 @@ package com.squareup.workflow1.buildsrc
22

33
import com.rickbusarow.kgx.libsCatalog
44
import com.rickbusarow.kgx.pluginId
5+
import com.rickbusarow.kgx.version
56
import com.squareup.workflow1.buildsrc.internal.invoke
67
import com.squareup.workflow1.buildsrc.internal.isRunningFromIde
78
import com.squareup.workflow1.buildsrc.internal.javaLanguageVersion
89
import com.squareup.workflow1.buildsrc.internal.javaTarget
9-
import com.squareup.workflow1.buildsrc.internal.javaTargetInt
1010
import com.squareup.workflow1.buildsrc.internal.kotlin
1111
import org.gradle.api.Project
12-
import org.gradle.api.tasks.compile.JavaCompile
1312
import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode.Strict
1413
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1514
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
1615
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
17-
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
1816

1917
fun Project.kotlinCommonSettings(bomConfigurationName: String) {
2018
pluginManager.apply(libsCatalog.pluginId("ktlint"))
2119

2220
// force the same Kotlin version everywhere, including transitive dependencies
2321
dependencies {
24-
add(bomConfigurationName, platform(kotlin("bom")))
22+
add(
23+
bomConfigurationName,
24+
platform(kotlin(module = "bom", version = libsCatalog.version("kotlin")))
25+
)
2526
}
2627

2728
extensions.configure(KotlinProjectExtension::class.java) { extension ->

0 commit comments

Comments
 (0)