Skip to content

Commit e3c80d3

Browse files
committed
bumping keywords-generator for kotlin 2.2, now using dynamic kotlin compiler version
1 parent 7a29d75 commit e3c80d3

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

plugins/keywords-generator/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
@file:OptIn(ExperimentalBuildToolsApi::class, ExperimentalKotlinGradlePluginApi::class)
2+
3+
import org.jetbrains.kotlin.buildtools.api.ExperimentalBuildToolsApi
4+
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
15
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
36

47
plugins {
58
`java-gradle-plugin`
69
`kotlin-dsl`
710
id("com.github.gmazzo.buildconfig") version "5.5.1"
811
}
912

10-
val kotlinCompilerVersion: String by project
1113
val kotlinPoetVersion: String by project
1214

1315
repositories {
@@ -17,11 +19,11 @@ repositories {
1719
buildConfig {
1820
packageName = "org.jetbrains.kotlinx.dataframe"
1921
className = "BuildConfig"
20-
buildConfigField("kotlinCompilerVersion", kotlinCompilerVersion)
22+
buildConfigField("kotlinCompilerVersion", kotlin.compilerVersion.get())
2123
}
2224

2325
dependencies {
24-
compileOnly(kotlin("compiler-embeddable", kotlinCompilerVersion))
26+
compileOnly(kotlin("compiler-embeddable", kotlin.compilerVersion.get()))
2527
implementation("com.squareup:kotlinpoet:$kotlinPoetVersion")
2628
}
2729

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
kotlinCompilerVersion=2.0.20
2-
kotlinPoetVersion=2.0.0
1+
kotlinPoetVersion=2.2.0

plugins/keywords-generator/src/main/kotlin/org/jetbrains/dataframe/keywords/KeywordsGeneratorAction.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.squareup.kotlinpoet.TypeSpec
88
import org.gradle.workers.WorkAction
99
import org.gradle.workers.WorkParameters
1010
import org.jetbrains.kotlin.com.intellij.psi.tree.TokenSet
11+
import org.jetbrains.kotlin.config.KotlinCompilerVersion
1112
import org.jetbrains.kotlin.lexer.KtKeywordToken
1213
import org.jetbrains.kotlin.lexer.KtTokens
1314
import java.io.File
@@ -21,6 +22,7 @@ abstract class KeywordsGeneratorAction : WorkAction<KeywordsGeneratorAction.Para
2122
private val taskPackageName = "org.jetbrains.kotlinx.dataframe.keywords"
2223

2324
override fun execute() {
25+
println("Generating keywords using Kotlin compiler: ${KotlinCompilerVersion.getVersion()}")
2426
parameters.srcDir.deleteRecursively()
2527
generateKeywordEnums()
2628
}

0 commit comments

Comments
 (0)