From e063681b9e26e3553fdf16f015515b39b4eb0cc4 Mon Sep 17 00:00:00 2001
From: Cam Walter <cam.n.walter@gmail.com>
Date: Wed, 7 Feb 2024 12:31:14 -0600
Subject: [PATCH] Build: Fix typing-generator requiring api file

---
 build.gradle.kts                     | 3 ++-
 gradle/libs.versions.toml            | 3 ++-
 typing-generator/build.gradle.kts    | 8 +++++++-
 typing-generator/settings.gradle.kts | 9 ---------
 4 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 typing-generator/settings.gradle.kts

diff --git a/build.gradle.kts b/build.gradle.kts
index 8eb1de3b..3fecf30f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -66,7 +66,8 @@ java {
 }
 
 apiValidation {
-    ignoredPackages.add("com.chattriggers.ctjs.internal")
+    ignoredProjects += "typing-generator"
+    ignoredPackages += "com.chattriggers.ctjs.internal"
 }
 
 tasks {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f0dea310..bab17c60 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -52,6 +52,7 @@ devauth = { module = "me.djtheredstoner:DevAuth-fabric", version.ref = "devauth"
 versioning = { module = "org.jetbrains.dokka:versioning-plugin", version.ref = "dokka" }
 
 ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
+gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 
 [bundles]
 fabric = ["fabric-loader", "fabric-api", "fabric-kotlin"]
@@ -65,4 +66,4 @@ loom = { id = "fabric-loom", version.ref = "loom" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "validator" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
-kotlin-gradle-plugin = { id = "org.jetbrains.kotlin.gradle-plugin", version.ref = "kotlin" }
+
diff --git a/typing-generator/build.gradle.kts b/typing-generator/build.gradle.kts
index 4eb72ffa..d2cbcc7c 100644
--- a/typing-generator/build.gradle.kts
+++ b/typing-generator/build.gradle.kts
@@ -1,5 +1,11 @@
+buildscript {
+    dependencies {
+        classpath(libs.gradle.plugin)
+    }
+}
+
 plugins {
-    kotlin("jvm")
+    alias(libs.plugins.kotlin)
 }
 
 repositories {
diff --git a/typing-generator/settings.gradle.kts b/typing-generator/settings.gradle.kts
deleted file mode 100644
index 35b3dfff..00000000
--- a/typing-generator/settings.gradle.kts
+++ /dev/null
@@ -1,9 +0,0 @@
-plugins {
-    alias(libs.plugins.kotlin).version(libs.versions.ksp).apply(false)
-}
-
-buildscript {
-    dependencies {
-        classpath(libs.plugins.kotlin.gradle.plugin)
-    }
-}