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 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/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/.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 diff --git a/ktcodeshift-dsl/build.gradle.kts b/ktcodeshift-dsl/build.gradle.kts index 6ac18052..8ce1e81e 100644 --- a/ktcodeshift-dsl/build.gradle.kts +++ b/ktcodeshift-dsl/build.gradle.kts @@ -11,8 +11,8 @@ dependencies { implementation(platform("org.jetbrains.kotlin:kotlin-bom")) // 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("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") implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies") @@ -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 {