From e98b9c1ce376f43a000604e9b69b141bf93f5b74 Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Tue, 2 Aug 2022 23:11:02 -0500 Subject: [PATCH] Remove Kotlin/Native specific compiler plugin artifact --- .../bnorm/power/PowerAssertGradlePlugin.kt | 6 - kotlin-power-assert-plugin-native/.gitignore | 1 - .../build.gradle.kts | 115 ------------------ sample/gradle.properties | 2 + settings.gradle.kts | 1 - 5 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 kotlin-power-assert-plugin-native/.gitignore delete mode 100644 kotlin-power-assert-plugin-native/build.gradle.kts diff --git a/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradlePlugin.kt b/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradlePlugin.kt index 8f79fb74573..79c0860e3ee 100644 --- a/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradlePlugin.kt +++ b/kotlin-power-assert-gradle/src/main/kotlin/com/bnorm/power/PowerAssertGradlePlugin.kt @@ -42,12 +42,6 @@ class PowerAssertGradlePlugin : KotlinCompilerPluginSupportPlugin { version = BuildConfig.PLUGIN_VERSION ) - override fun getPluginArtifactForNative(): SubpluginArtifact = SubpluginArtifact( - groupId = BuildConfig.PLUGIN_GROUP_ID, - artifactId = BuildConfig.PLUGIN_ARTIFACT_ID + "-native", - version = BuildConfig.PLUGIN_VERSION - ) - override fun applyToCompilation( kotlinCompilation: KotlinCompilation<*> ): Provider> { diff --git a/kotlin-power-assert-plugin-native/.gitignore b/kotlin-power-assert-plugin-native/.gitignore deleted file mode 100644 index 8eba6c8dd4d..00000000000 --- a/kotlin-power-assert-plugin-native/.gitignore +++ /dev/null @@ -1 +0,0 @@ -src/ diff --git a/kotlin-power-assert-plugin-native/build.gradle.kts b/kotlin-power-assert-plugin-native/build.gradle.kts deleted file mode 100644 index 19b06ab6b9d..00000000000 --- a/kotlin-power-assert-plugin-native/build.gradle.kts +++ /dev/null @@ -1,115 +0,0 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { - kotlin("jvm") - kotlin("kapt") - id("org.jetbrains.dokka") - - signing - `maven-publish` -} - -dependencies { - compileOnly("org.jetbrains.kotlin:kotlin-compiler") - - kapt("com.google.auto.service:auto-service:1.0.1") - compileOnly("com.google.auto.service:auto-service-annotations:1.0.1") -} - -tasks.named("compileKotlin") { dependsOn("syncSource") } -tasks.register("syncSource") { - from(project(":kotlin-power-assert-plugin").sourceSets.main.get().allSource) - into("src/main/kotlin") - filter { - // Replace shadowed imports from kotlin-power-assert-plugin - when (it) { - "import org.jetbrains.kotlin.com.intellij.mock.MockProject" -> "import com.intellij.mock.MockProject" - else -> it - } - } -} - -tasks.withType { - kotlinOptions.jvmTarget = "1.8" -} - -tasks.register("sourcesJar", Jar::class) { - group = "build" - description = "Assembles Kotlin sources" - - archiveClassifier.set("sources") - from(sourceSets.main.get().allSource) - dependsOn(tasks.classes) -} - -tasks.register("dokkaJar", Jar::class) { - group = "documentation" - description = "Assembles Kotlin docs with Dokka" - - archiveClassifier.set("javadoc") - from(tasks.dokkaHtml) - dependsOn(tasks.dokkaHtml) -} - -signing { - setRequired(provider { gradle.taskGraph.hasTask("publish") }) - sign(publishing.publications) -} - -publishing { - publications { - create("default") { - from(components["java"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["dokkaJar"]) - - pom { - name.set(project.name) - description.set("Kotlin compiler plugin to enable power assertions in the Kotlin programming language") - url.set("https://github.com/bnorm/kotlin-power-assert") - - licenses { - license { - name.set("Apache License 2.0") - url.set("https://github.com/bnorm/kotlin-power-assert/blob/master/LICENSE.txt") - } - } - scm { - url.set("https://github.com/bnorm/kotlin-power-assert") - connection.set("scm:git:git://github.com/bnorm/kotlin-power-assert.git") - } - developers { - developer { - name.set("Brian Norman") - url.set("https://github.com/bnorm") - } - } - } - } - } - - repositories { - if ( - hasProperty("sonatypeUsername") && - hasProperty("sonatypePassword") && - hasProperty("sonatypeSnapshotUrl") && - hasProperty("sonatypeReleaseUrl") - ) { - maven { - val url = when { - "SNAPSHOT" in version.toString() -> property("sonatypeSnapshotUrl") - else -> property("sonatypeReleaseUrl") - } as String - setUrl(url) - credentials { - username = property("sonatypeUsername") as String - password = property("sonatypePassword") as String - } - } - } - maven { - name = "test" - setUrl("file://${rootProject.buildDir}/localMaven") - } - } -} diff --git a/sample/gradle.properties b/sample/gradle.properties index e3fcae2a8f3..72371df1280 100644 --- a/sample/gradle.properties +++ b/sample/gradle.properties @@ -1,2 +1,4 @@ org.gradle.daemon=false +org.gradle.jvmargs=-Xmx4g kotlin.compiler.execution.strategy=in-process +kotlin.mpp.stability.nowarn=true diff --git a/settings.gradle.kts b/settings.gradle.kts index c06206a3433..ec2254a6d90 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,4 +2,3 @@ rootProject.name = "kotlin-power-assert" include(":kotlin-power-assert-gradle") include(":kotlin-power-assert-plugin") -include(":kotlin-power-assert-plugin-native")