diff --git a/.gitignore b/.gitignore
index 46ae992bc2884..cd529659b9a84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ build/
 # IDEA
 out/
 .idea/
+*.iml
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
diff --git a/kotlin-power-assert/build.gradle.kts b/kotlin-power-assert/build.gradle.kts
index f3fee63b93e47..0a9668461eecb 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 7f554650bae7b..fc3e3b4ab1938 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 294955c169a5a..0000000000000
--- 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