From 5fef68a71bf6f0831282bd0f70f3830a26c7a42d Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Mon, 25 May 2020 10:30:22 -0500 Subject: [PATCH 1/3] Fix default function for Gradle plugin --- .../main/kotlin/com/bnorm/power/PowerAssertGradleExtension.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleExtension.kt b/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleExtension.kt index 9c1f7094a95..68976c0207e 100644 --- a/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleExtension.kt +++ b/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleExtension.kt @@ -17,5 +17,5 @@ package com.bnorm.power open class PowerAssertGradleExtension { - var functions: List = listOf("kotlin.AssertionKt.assert") + var functions: List = listOf("kotlin.assert") } From 23de2963e9cc22dd0c88ce27db8230098d59b6a5 Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Mon, 25 May 2020 10:38:19 -0500 Subject: [PATCH 2/3] Prepare for release 0.3.1 --- CHANGELOG.md | 7 +++++++ build.gradle.kts | 4 ++-- .../kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8ef2e06852..006c931ae0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Change Log ========== +## Version 0.3.1 + +_2020-05-25_ + + * Fix: Do not include wrapper class for top-level function in Gradle plugin + default function. + ## Version 0.3.0 _2020-03-07_ diff --git a/build.gradle.kts b/build.gradle.kts index 82a5872ee5f..57461637761 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,12 @@ plugins { kotlin("jvm") version "1.3.70" apply false id("org.jetbrains.dokka") version "0.10.0" apply false - id("com.gradle.plugin-publish") version "0.10.1" apply false + id("com.gradle.plugin-publish") version "0.11.0" apply false } allprojects { group = "com.bnorm.power" - version = "0.4.0-SNAPSHOT" + version = "0.3.1" } subprojects { diff --git a/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt b/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt index dda483ad410..e371c054480 100644 --- a/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt +++ b/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt @@ -37,7 +37,7 @@ class PowerAssertGradleSubplugin : KotlinGradleSubplugin { override fun getPluginArtifact(): SubpluginArtifact = SubpluginArtifact( groupId = "com.bnorm.power", artifactId = "kotlin-power-assert", - version = "0.4.0-SNAPSHOT" + version = "0.3.1" ) override fun apply( From 25722c0b54bf84f3d8eede2ad19ed059ac92f47c Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Mon, 25 May 2020 10:48:52 -0500 Subject: [PATCH 3/3] Prepare next development version --- build.gradle.kts | 2 +- .../main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 57461637761..99750e8ab5f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { allprojects { group = "com.bnorm.power" - version = "0.3.1" + version = "0.4.0-SNAPSHOT" } subprojects { diff --git a/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt b/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt index e371c054480..dda483ad410 100644 --- a/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt +++ b/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradleSubplugin.kt @@ -37,7 +37,7 @@ class PowerAssertGradleSubplugin : KotlinGradleSubplugin { override fun getPluginArtifact(): SubpluginArtifact = SubpluginArtifact( groupId = "com.bnorm.power", artifactId = "kotlin-power-assert", - version = "0.3.1" + version = "0.4.0-SNAPSHOT" ) override fun apply(