diff --git a/build.gradle.kts b/build.gradle.kts index 82a5872ee5f..35f473d3a91 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.3.70" apply false + kotlin("jvm") version "1.4-M1" apply false id("org.jetbrains.dokka") version "0.10.0" apply false id("com.gradle.plugin-publish") version "0.10.1" apply false } @@ -13,5 +13,6 @@ subprojects { repositories { mavenCentral() jcenter() + maven("https://dl.bintray.com/kotlin/kotlin-eap") } } diff --git a/kotlin-power-assert/build.gradle.kts b/kotlin-power-assert/build.gradle.kts index 30deba140ff..640c417ced8 100644 --- a/kotlin-power-assert/build.gradle.kts +++ b/kotlin-power-assert/build.gradle.kts @@ -11,13 +11,13 @@ plugins { dependencies { implementation(kotlin("stdlib-jdk8")) - compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.70") + compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4-M1") kapt("com.google.auto.service:auto-service:1.0-rc6") compileOnly("com.google.auto.service:auto-service-annotations:1.0-rc6") testImplementation(kotlin("test-junit")) - testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.70") + testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.4-M1") testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.2.6") } diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt b/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt index 4cad0010fe3..f4eb07bcea3 100644 --- a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt +++ b/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt @@ -37,6 +37,7 @@ import org.jetbrains.kotlin.ir.builders.irCallOp import org.jetbrains.kotlin.ir.builders.irFalse import org.jetbrains.kotlin.ir.builders.irReturn import org.jetbrains.kotlin.ir.builders.irString +import org.jetbrains.kotlin.ir.builders.parent import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.ir.declarations.path @@ -114,7 +115,7 @@ class PowerAssertCallTransformer( val title = when { messageArgument is IrConst<*> -> messageArgument messageArgument is IrStringConcatenation -> messageArgument - lambda != null -> lambda.inline() + lambda != null -> lambda.inline(parent) messageArgument != null -> { val invoke = messageArgument.type.getClass()!!.functions.single { it.name == OperatorNameConventions.INVOKE } irCallOp(invoke.symbol, invoke.returnType, messageArgument) diff --git a/settings.gradle.kts b/settings.gradle.kts index ecb6a630422..dc76dad50dd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,11 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven ("https://dl.bintray.com/kotlin/kotlin-eap") + } +} + rootProject.name = "kotlin-power-assert" include(":kotlin-power-assert")