Move KSP into ftl-plugin

TBD54566975 · Sep 6, 2023 · d809c31 · d809c31
1 parent b07bf86
commit d809c31
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 106 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+.git/
+.idea/
+.gradle/
 .hermit/
 .vscode/
 .idea/

diff --git a/examples/echo-kotlin/build.gradle.kts b/examples/echo-kotlin/build.gradle.kts
@@ -13,8 +13,8 @@ repositories {
 
 dependencies {
   implementation("xyz.block.ftl:ftl-runtime")
-  implementation("xyz.block.ftl:ftl-schema")
-  ksp("xyz.block.ftl:ftl-schema")
+  implementation("com.google.devtools.ksp:symbol-processing-api:1.9.0-1.0.11")
+  ksp(project("xyz.block.ftl:ftl-plugin"))
 }
 
 ftl {

diff --git a/examples/echo-kotlin/gradle.properties b/examples/echo-kotlin/gradle.properties
@@ -1 +1,2 @@
+kotlin.code.style=official
 org.gradle.caching=true
diff --git a/examples/echo-kotlin/settings.gradle.kts b/examples/echo-kotlin/settings.gradle.kts
@@ -1,5 +1,3 @@
-plugins {}
-
 rootProject.name = "echo"
 
 includeBuild("../../kotlin-runtime/ftl-runtime") {
@@ -9,9 +7,8 @@ includeBuild("../../kotlin-runtime/ftl-runtime") {
 }
 
 includeBuild("../../kotlin-runtime/ftl-plugin")
-
-includeBuild("../../kotlin-runtime/ftl-schema") {
+includeBuild("../../kotlin-runtime/ftl-plugin") {
   dependencySubstitution {
-    substitute(module("xyz.block.ftl:ftl-schema")).using(project(":"))
+    substitute(module("xyz.block.ftl:ftl-plugin")).using(project(":"))
   }
 }
diff --git a/kotlin-runtime/ftl-plugin/build.gradle.kts b/kotlin-runtime/ftl-plugin/build.gradle.kts
@@ -1,5 +1,6 @@
 buildscript {
   dependencies {
+    classpath(kotlin("gradle-plugin", version = "1.9.0"))
     classpath("com.squareup.wire:wire-gradle-plugin:4.7.2")
   }
 }
@@ -8,6 +9,7 @@ plugins {
   kotlin("jvm") version "1.9.0"
   id("java-gradle-plugin")
   id("com.squareup.wire") version "4.7.2"
+  id("com.google.devtools.ksp") version "1.9.0-1.0.11"
 }
 
 repositories {
@@ -31,6 +33,7 @@ gradlePlugin {
 
 dependencies {
   compileOnly(gradleApi())
+  implementation(libs.kspApi)
   implementation(project(":ftl-runtime"))
 
   // Use the Kotlin JUnit 5 integration.

diff --git a/kotlin-runtime/ftl-schema/gradle.properties → kotlin-runtime/ftl-plugin/gradle.properties b/kotlin-runtime/ftl-schema/gradle.properties → kotlin-runtime/ftl-plugin/gradle.properties
diff --git a/...tlin/xyz/block/ftl/ksp/SchemaExtractor.kt → ...tlin/xyz/block/ftl/ksp/SchemaExtractor.kt b/...tlin/xyz/block/ftl/ksp/SchemaExtractor.kt → ...tlin/xyz/block/ftl/ksp/SchemaExtractor.kt
diff --git a/...ls.ksp.processing.SymbolProcessorProvider → ...ls.ksp.processing.SymbolProcessorProvider b/...ls.ksp.processing.SymbolProcessorProvider → ...ls.ksp.processing.SymbolProcessorProvider
diff --git a/kotlin-runtime/ftl-schema/.gitignore b/kotlin-runtime/ftl-schema/.gitignore
diff --git a/kotlin-runtime/ftl-schema/bin b/kotlin-runtime/ftl-schema/bin
diff --git a/kotlin-runtime/ftl-schema/build.gradle.kts b/kotlin-runtime/ftl-schema/build.gradle.kts
diff --git a/kotlin-runtime/ftl-schema/settings.gradle.kts b/kotlin-runtime/ftl-schema/settings.gradle.kts
diff --git a/kotlin-runtime/gradle/libs.versions.toml b/kotlin-runtime/gradle/libs.versions.toml
@@ -25,6 +25,7 @@ grpcNetty = { module = "io.grpc:grpc-netty", version.ref = "grpc" }
 grpcProtobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
 grpcStub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin" }
+kspApi = { module = "com.google.devtools.ksp:symbol-processing-api", version = "1.9.0-1.0.11" }
 
 [plugins]
 wire = { id = "com.squareup.wire", version.ref = "wire" }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		kotlin.code.style=official
		org.gradle.caching=true