Make kotlin-runtime a multi-module project (#362)

TBD54566975 · Sep 6, 2023 · 0070255 · 0070255
1 parent 5825249
commit 0070255
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 75 deletions.
diff --git a/examples/echo-kotlin/build.gradle.kts b/examples/echo-kotlin/build.gradle.kts
@@ -1,17 +1,18 @@
+repositories {
+  flatDir {
+    dirs("../../kotlin-runtime/ftl-plugin/build/libs")
+  }
+  mavenCentral()
+}
+
 plugins {
   kotlin("jvm") version "1.9.0"
-  // Apply the java-library plugin for API and implementation separation.
   `java-library`
   id("xyz.block.ftl")
 }
 
-repositories {
-  // Use Maven Central for resolving dependencies.
-  mavenCentral()
-}
-
 dependencies {
-  implementation("xyz.block.ftl:ftl-runtime")
+  implementation("xyz.block:ftl-runtime")
 }
 
 ftl {

diff --git a/examples/echo-kotlin/settings.gradle.kts b/examples/echo-kotlin/settings.gradle.kts
@@ -1,10 +1,3 @@
-plugins {}
-
 rootProject.name = "echo"
-includeBuild("../../kotlin-runtime/ftl-runtime") {
-  dependencySubstitution {
-    substitute(module("xyz.block.ftl:ftl-runtime")).using(project(":"))
-  }
-}
 
-includeBuild("../../kotlin-runtime/ftl-plugin")
+includeBuild("../../kotlin-runtime")
diff --git a/kotlin-runtime/build.gradle.kts b/kotlin-runtime/build.gradle.kts
@@ -0,0 +1,9 @@
+allprojects {
+  repositories {
+    mavenCentral()
+  }
+}
+
+plugins {
+  kotlin("jvm") version "1.9.0"
+}
diff --git a/kotlin-runtime/ftl-plugin/build.gradle.kts b/kotlin-runtime/ftl-plugin/build.gradle.kts
@@ -1,20 +1,9 @@
-buildscript {
-  dependencies {
-    classpath("com.squareup.wire:wire-gradle-plugin:4.7.2")
-  }
-}
-
 plugins {
-  kotlin("jvm") version "1.9.0"
+  kotlin("jvm")
   id("java-gradle-plugin")
   id("com.squareup.wire") version "4.7.2"
 }
 
-repositories {
-  // Use Maven Central for resolving dependencies.
-  mavenCentral()
-}
-
 group = "xyz.block"
 version = "1.0-SNAPSHOT"
 

diff --git a/kotlin-runtime/ftl-plugin/settings.gradle.kts b/kotlin-runtime/ftl-plugin/settings.gradle.kts
diff --git a/kotlin-runtime/ftl-plugin/src/main/kotlin/xyz/block/ftl/gradle/FTLClient.kt b/kotlin-runtime/ftl-plugin/src/main/kotlin/xyz/block/ftl/gradle/FTLClient.kt
@@ -42,7 +42,6 @@ class FTLClient(ftlEndpoint: String) {
   }
 
   fun getSchema(): Schema? {
-    val schemas = mutableListOf<PullSchemaResponse>()
     val client = grpcClient.create(ControllerServiceClient::class)
     return client.GetSchema().executeBlocking(GetSchemaRequest()).schema
   }

diff --git a/kotlin-runtime/ftl-plugin/src/main/kotlin/xyz/block/ftl/gradle/ModuleGenerator.kt b/kotlin-runtime/ftl-plugin/src/main/kotlin/xyz/block/ftl/gradle/ModuleGenerator.kt
@@ -40,7 +40,7 @@ class ModuleGenerator() {
     val file = FileSpec.builder(namespace, className)
       .addFileComment("Code generated by FTL-Plugin, do not edit.")
 
-    schema.comments?.let {
+    schema.comments.let {
       file.addFileComment("\n")
       file.addFileComment(it.joinToString("\n"))
     }
@@ -51,10 +51,10 @@ class ModuleGenerator() {
         FunSpec.constructorBuilder().build()
       )
 
-    val types = schema.decls?.mapNotNull { it.data_ } ?: listOf()
+    val types = schema.decls.mapNotNull { it.data_ }
     types.forEach { file.addType(buildDataClass(it)) }
 
-    val verbs = schema.decls?.mapNotNull { it.verb } ?: listOf()
+    val verbs = schema.decls.mapNotNull { it.verb }
     verbs.forEach { moduleClass.addFunction(buildVerbFunction(className, it)) }
 
     file.addType(moduleClass.build())

diff --git a/kotlin-runtime/ftl-runtime/build.gradle.kts b/kotlin-runtime/ftl-runtime/build.gradle.kts
@@ -3,7 +3,7 @@ version = "0.1.0-SNAPSHOT"
 
 plugins {
   id("com.squareup.wire") version "4.7.2"
-  kotlin("jvm") version "1.9.0"
+  kotlin("jvm")
   // Apply the java-library plugin for API and implementation separation.
   `java-library`
 }

diff --git a/kotlin-runtime/ftl-runtime/settings.gradle.kts b/kotlin-runtime/ftl-runtime/settings.gradle.kts
diff --git a/kotlin-runtime/settings.gradle.kts b/kotlin-runtime/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "kotlin-runtime"
+include(":ftl-plugin", ":ftl-runtime")
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		rootProject.name = "kotlin-runtime"
		include(":ftl-plugin", ":ftl-runtime")