Skip to content

Commit 05b19db

Browse files
committed
update to Kotlin 1.8.20
1 parent f2320c1 commit 05b19db

File tree

6 files changed

+14
-7
lines changed

6 files changed

+14
-7
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
plugins {
11-
kotlin("jvm") version "1.8.0" apply false
11+
kotlin("jvm") version "1.8.20" apply false
1212
id("org.jetbrains.dokka") version "1.7.10" apply false
1313
id("com.github.gmazzo.buildconfig") version "2.1.0" apply false
1414
id("com.bennyhuo.kotlin.plugin.embeddable") version "1.8.1" apply false

trimindent-compiler/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717

1818
testImplementation(kotlin("test-junit"))
1919
testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
20-
testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.8.0.0-SNAPSHOT")
20+
testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.8.0.0")
2121
}
2222

2323
val compileKotlin: KotlinCompile by tasks

trimindent-compiler/src/main/java/com/bennyhuo/kotlin/trimindent/compiler/IrUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ internal fun IrCall.isTrimIndent(): Boolean {
3434
return symbol.owner.name == Name.identifier("trimIndent")
3535
&& dispatchReceiver == null
3636
&& extensionReceiver?.type?.classFqName?.asString() == "kotlin.String"
37-
&& symbol.owner.getPackageFragment()?.fqName?.asString() == "kotlin.text"
37+
&& symbol.owner.getPackageFragment().fqName.asString() == "kotlin.text"
3838
}
3939

4040
fun IrPluginContext.prependIndent(): IrFunction {

trimindent-compiler/src/main/java/com/bennyhuo/kotlin/trimindent/compiler/TrimIndentIrGenerator.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ package com.bennyhuo.kotlin.trimindent.compiler
33
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
44
import org.jetbrains.kotlin.backend.common.extensions.IrPluginContext
55
import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
6-
import org.jetbrains.kotlin.ir.expressions.*
7-
import org.jetbrains.kotlin.ir.util.transformFlat
6+
import org.jetbrains.kotlin.ir.expressions.IrCall
7+
import org.jetbrains.kotlin.ir.expressions.IrConst
8+
import org.jetbrains.kotlin.ir.expressions.IrConstKind
9+
import org.jetbrains.kotlin.ir.expressions.IrExpression
10+
import org.jetbrains.kotlin.ir.expressions.IrStringConcatenation
811
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
912
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
10-
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
1113

1214
class TrimIndentIrGenerator : IrGenerationExtension {
1315

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.bennyhuo.kotlin.trimindent.compiler
2+
3+
/**
4+
* Created by benny.
5+
*/
6+
inline fun <reified T : Any> Any?.safeAs(): T? = this as? T

trimindent-compiler/src/test/java/com/bennyhuo/kotlin/trimindent/compiler/TrimIndentTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.bennyhuo.kotlin.trimindent.compiler
22

3-
import com.bennyhuo.kotlin.compiletesting.extensions.module.IR_OUTPUT_TYPE_KOTLIN_LIKE
43
import com.bennyhuo.kotlin.compiletesting.extensions.module.IR_OUTPUT_TYPE_KOTLIN_LIKE_JC
54
import com.bennyhuo.kotlin.compiletesting.extensions.module.KotlinModule
65
import com.bennyhuo.kotlin.compiletesting.extensions.module.checkResult

0 commit comments

Comments
 (0)