Updates for Arrow Meta

* Use the new artifact name (arrow-kt/arrow-meta#810) * Update to the TypedQuotes classDeclaration (arrow-kt/arrow-meta#808)
intuit · May 10, 2021 · e80096a · e80096a
1 parent 1f01b98
commit e80096a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/compiler-plugin/api/compiler-plugin.api b/compiler-plugin/api/compiler-plugin.api
@@ -34,6 +34,7 @@ public class com/intuit/hooks/plugin/HooksMetaPlugin : arrow/meta/Meta {
 	public fun irDelegatingConstructorCall (Larrow/meta/Meta;Lkotlin/jvm/functions/Function2;)Larrow/meta/phases/codegen/ir/IRGeneration;
 	public fun irDoWhileLoop (Larrow/meta/Meta;Lkotlin/jvm/functions/Function2;)Larrow/meta/phases/codegen/ir/IRGeneration;
 	public fun irDump (Larrow/meta/Meta;)Larrow/meta/phases/codegen/ir/IRGeneration;
+	public fun irDumpKotlinLike (Larrow/meta/Meta;Lorg/jetbrains/kotlin/ir/util/KotlinLikeDumpOptions;)Larrow/meta/phases/codegen/ir/IRGeneration;
 	public fun irDynamicExpression (Larrow/meta/Meta;Lkotlin/jvm/functions/Function2;)Larrow/meta/phases/codegen/ir/IRGeneration;
 	public fun irDynamicMemberExpression (Larrow/meta/Meta;Lkotlin/jvm/functions/Function2;)Larrow/meta/phases/codegen/ir/IRGeneration;
 	public fun irDynamicOperatorExpression (Larrow/meta/Meta;Lkotlin/jvm/functions/Function2;)Larrow/meta/phases/codegen/ir/IRGeneration;

diff --git a/compiler-plugin/build.gradle.kts b/compiler-plugin/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     pluginDependency("io.arrow-kt", "arrow-annotations", ARROW_VERSION)
     pluginDependency("io.arrow-kt", "arrow-syntax", ARROW_VERSION)
     pluginDependency("io.arrow-kt", "arrow-core-data", ARROW_VERSION)
-    pluginDependency("io.arrow-kt", "compiler-plugin-core", ARROW_META_VERSION)
+    pluginDependency("io.arrow-kt", "arrow-meta", ARROW_META_VERSION)
 
     compileOnly(kotlin("stdlib"))
     compileOnly(kotlin("compiler-embeddable"))
@@ -28,7 +28,7 @@ dependencies {
     testImplementation(project(":hooks"))
     testImplementation("io.arrow-kt:arrow-meta-prelude:$ARROW_META_VERSION")
     testImplementation("io.arrow-kt:arrow-core:$ARROW_VERSION")
-    testImplementation("io.arrow-kt:compiler-plugin:$ARROW_META_VERSION")
+    testImplementation("io.arrow-kt:arrow-meta:$ARROW_META_VERSION")
     testImplementation("io.arrow-kt:meta-test:$ARROW_META_VERSION")
 }
 

diff --git a/compiler-plugin/src/main/kotlin/com/intuit/hooks/plugin/Hooks.kt b/compiler-plugin/src/main/kotlin/com/intuit/hooks/plugin/Hooks.kt
@@ -17,11 +17,11 @@ internal val Meta.hooks: CliPlugin
     get() =
         "Hooks" {
             meta(
-                classDeclaration(this, KtClass::isHooksDslClass) { c ->
+                classDeclaration(this, { this.element.isHooksDslClass }) { c ->
                     findHooks().map<Transform<KtClass>> { codeGen ->
-                        val `package` = c.containingKtFile.packageDirective?.text ?: ""
+                        val `package` = c.element.containingKtFile.packageDirective?.text ?: ""
                         val (classes, properties) = codeGen.map(::generateHookClass).unzip()
-                        val imports = createImportDirectives(c, codeGen)
+                        val imports = createImportDirectives(c.element, codeGen)
 
                         val newSource =
                             """|${`package`}