Update project for Kotlin 1.4-M1
This commit is contained in:
+2
-1
@@ -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")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user