From 6561a072f6de527ce60e665bfeac4e4ee36d364d Mon Sep 17 00:00:00 2001 From: orangain Date: Sun, 20 Jul 2025 14:40:18 +0900 Subject: [PATCH 1/4] Update ktast to 0.11.0 --- .idea/kotlinc.xml | 6 ++++++ ktcodeshift-dsl/build.gradle.kts | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .idea/kotlinc.xml diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..131e44d7 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/ktcodeshift-dsl/build.gradle.kts b/ktcodeshift-dsl/build.gradle.kts index 6ac18052..cdf19a21 100644 --- a/ktcodeshift-dsl/build.gradle.kts +++ b/ktcodeshift-dsl/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { // Use the Kotlin JDK 8 standard library. implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - implementation("com.github.orangain.ktast:ast-psi:0.10.0") + implementation("com.github.orangain.ktast:ast-psi:0.11.0") implementation("org.jetbrains.kotlin:kotlin-scripting-common") implementation("org.jetbrains.kotlin:kotlin-scripting-jvm") implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies") From 207043d1aec7a6ff95babe6906eafb97d503234f Mon Sep 17 00:00:00 2001 From: orangain Date: Sun, 20 Jul 2025 14:40:30 +0900 Subject: [PATCH 2/4] Require JDK 11 or later --- ktcodeshift-dsl/build.gradle.kts | 6 +++--- .../src/main/kotlin/ktcodeshift/script/ScriptDefinition.kt | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ktcodeshift-dsl/build.gradle.kts b/ktcodeshift-dsl/build.gradle.kts index cdf19a21..8ce1e81e 100644 --- a/ktcodeshift-dsl/build.gradle.kts +++ b/ktcodeshift-dsl/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom")) // Use the Kotlin JDK 8 standard library. - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") + implementation("org.jetbrains.kotlin:kotlin-stdlib") implementation("com.github.orangain.ktast:ast-psi:0.11.0") implementation("org.jetbrains.kotlin:kotlin-scripting-common") implementation("org.jetbrains.kotlin:kotlin-scripting-jvm") @@ -23,13 +23,13 @@ dependencies { tasks.withType { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(11)) } } diff --git a/ktcodeshift-dsl/src/main/kotlin/ktcodeshift/script/ScriptDefinition.kt b/ktcodeshift-dsl/src/main/kotlin/ktcodeshift/script/ScriptDefinition.kt index d2b0f6d9..a5d27d82 100644 --- a/ktcodeshift-dsl/src/main/kotlin/ktcodeshift/script/ScriptDefinition.kt +++ b/ktcodeshift-dsl/src/main/kotlin/ktcodeshift/script/ScriptDefinition.kt @@ -11,6 +11,7 @@ import kotlin.script.experimental.host.FileScriptSource import kotlin.script.experimental.jvm.JvmDependency import kotlin.script.experimental.jvm.dependenciesFromCurrentContext import kotlin.script.experimental.jvm.jvm +import kotlin.script.experimental.jvm.jvmTarget @Suppress("unused") @KotlinScript( @@ -34,6 +35,8 @@ object TransformScriptCompilationConfiguration : ScriptCompilationConfiguration( jvm { // Extract the whole classpath from context classloader and use it as dependencies dependenciesFromCurrentContext(wholeClasspath = true) + // jvmTarget should be the same as the one used in the project + jvmTarget.put("11") } // Callbacks refineConfiguration { From 6fb1ac18a7f23737236764013f286ca265f89bf1 Mon Sep 17 00:00:00 2001 From: orangain Date: Sun, 20 Jul 2025 14:46:49 +0900 Subject: [PATCH 3/4] No longer manage some files in .idea dir --- .idea/jarRepositories.xml | 25 ------------------------- .idea/misc.xml | 5 ----- .idea/vcs.xml | 6 ------ 3 files changed, 36 deletions(-) delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index f5a0c5d6..00000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 2ce963bd..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddf..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From edfa4a94c3e25aa2cc36b983cfa87dcf097acf16 Mon Sep 17 00:00:00 2001 From: orangain Date: Sun, 20 Jul 2025 14:48:05 +0900 Subject: [PATCH 4/4] Ignore removed files --- .idea/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.idea/.gitignore b/.idea/.gitignore index 26d33521..97691b84 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,3 +1,6 @@ # Default ignored files /shelf/ /workspace.xml +/vcs.xml +/misc.xml +/jarRepositories.xml