From b668b820bc85fc25fda1b038c7c07962c9612060 Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Wed, 5 Feb 2020 23:22:05 -0500 Subject: [PATCH 1/3] Make Gradle wrappers executable --- gradlew | 0 gradlew.bat | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 gradlew mode change 100644 => 100755 gradlew.bat diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 From 53d8912622f7f9aacd397b3673cb2145a3e85a77 Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Wed, 5 Feb 2020 23:22:16 -0500 Subject: [PATCH 2/3] Ignore IntelliJ project files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 46ae992bc28..cd529659b9a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ build/ # IDEA out/ .idea/ +*.iml From 54202a7818c693930319bc3cfe44f2b781af514a Mon Sep 17 00:00:00 2001 From: Jake Wharton Date: Wed, 5 Feb 2020 23:28:47 -0500 Subject: [PATCH 3/3] Write service info from annotation processor --- kotlin-power-assert/build.gradle.kts | 4 ++++ .../kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt | 2 ++ .../org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar | 1 - 3 files changed, 6 insertions(+), 1 deletion(-) delete mode 100644 kotlin-power-assert/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar diff --git a/kotlin-power-assert/build.gradle.kts b/kotlin-power-assert/build.gradle.kts index f3fee63b93e..0a9668461ee 100644 --- a/kotlin-power-assert/build.gradle.kts +++ b/kotlin-power-assert/build.gradle.kts @@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") + kotlin("kapt") id("org.jetbrains.dokka") signing @@ -12,6 +13,9 @@ dependencies { implementation(kotlin("stdlib-jdk8")) compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.3.60") + 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.60") testImplementation("com.github.tschuchortdev:kotlin-compile-testing:1.2.5") diff --git a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt b/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt index 7f554650bae..fc3e3b4ab19 100644 --- a/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt +++ b/kotlin-power-assert/src/main/kotlin/com/bnorm/power/PowerAssertComponentRegistrar.kt @@ -16,11 +16,13 @@ package com.bnorm.power +import com.google.auto.service.AutoService import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.com.intellij.mock.MockProject import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar import org.jetbrains.kotlin.config.CompilerConfiguration +@AutoService(ComponentRegistrar::class) class PowerAssertComponentRegistrar : ComponentRegistrar { override fun registerProjectComponents( project: MockProject, diff --git a/kotlin-power-assert/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar b/kotlin-power-assert/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar deleted file mode 100644 index 294955c169a..00000000000 --- a/kotlin-power-assert/src/main/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar +++ /dev/null @@ -1 +0,0 @@ -com.bnorm.power.PowerAssertComponentRegistrar