From 237aa15396a35d0c2d6f0194c619ea788b150298 Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Tue, 22 Dec 2020 12:18:59 -0600 Subject: [PATCH 1/3] Testing Kotlin 1.4.30-M1 --- build.gradle.kts | 2 +- sample/build.gradle.kts | 2 +- sample/gradlew | 0 3 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 sample/gradlew diff --git a/build.gradle.kts b/build.gradle.kts index 7915da9..94b32f8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.4.20" apply false + kotlin("jvm") version "1.4.30-M1" apply false id("org.jetbrains.dokka") version "0.10.0" apply false id("com.gradle.plugin-publish") version "0.11.0" apply false id("com.github.gmazzo.buildconfig") version "2.0.2" apply false diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 174428d..3197a88 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.4.20" + kotlin("multiplatform") version "1.4.30-M1" id("com.bnorm.power.kotlin-power-assert") version "0.6.1" } diff --git a/sample/gradlew b/sample/gradlew old mode 100644 new mode 100755 From 871878bc2e1e0b0ef5744b696c7e96a7d3eabc9b Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Thu, 28 Jan 2021 21:56:52 -0600 Subject: [PATCH 2/3] Testing Kotlin 1.4.30-RC --- build.gradle.kts | 2 +- .../main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt | 2 +- sample/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 94b32f8..843f553 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.4.30-M1" apply false + kotlin("jvm") version "1.4.30-RC" apply false id("org.jetbrains.dokka") version "0.10.0" apply false id("com.gradle.plugin-publish") version "0.11.0" apply false id("com.github.gmazzo.buildconfig") version "2.0.2" apply false diff --git a/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt index 551f809..f133d38 100644 --- a/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt +++ b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt @@ -180,7 +180,7 @@ class PowerAssertCallTransformer( } parent = scope.parent } - val expression = IrFunctionExpressionImpl(-1, -1, parameters[1].type, lambda, IrStatementOrigin.LAMBDA) + val expression = IrFunctionExpressionImpl(original.startOffset, original.endOffset, parameters[1].type, lambda, IrStatementOrigin.LAMBDA) irCall(overload, type = overload.owner.returnType).apply { dispatchReceiver = original.dispatchReceiver?.deepCopyWithSymbols(parent) extensionReceiver = original.extensionReceiver?.deepCopyWithSymbols(parent) diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 3197a88..3f30cfb 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.4.30-M1" + kotlin("multiplatform") version "1.4.30-RC" id("com.bnorm.power.kotlin-power-assert") version "0.6.1" } From bd7ab03e76f617102033c6bf93e0f2fcfa2219ff Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Wed, 3 Feb 2021 18:06:59 -0600 Subject: [PATCH 3/3] Testing Kotlin 1.4.30 --- build.gradle.kts | 2 +- sample/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 843f553..36803a7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("jvm") version "1.4.30-RC" apply false + kotlin("jvm") version "1.4.30" apply false id("org.jetbrains.dokka") version "0.10.0" apply false id("com.gradle.plugin-publish") version "0.11.0" apply false id("com.github.gmazzo.buildconfig") version "2.0.2" apply false diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 3f30cfb..cc92129 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - kotlin("multiplatform") version "1.4.30-RC" + kotlin("multiplatform") version "1.4.30" id("com.bnorm.power.kotlin-power-assert") version "0.6.1" }