1 files changed, 11 insertions, 11 deletions
diff --git a/symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt b/symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt
index 5c205cc..3eaf3d6 100644
--- a/symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt
+++ b/symbols/src/main/kotlin/process/SubscribeAnnotationProcessor.kt
@@ -25,29 +25,27 @@ class SubscribeAnnotationProcessor(
     override fun finish() {
         subscriptions.sort()
         if (subscriptions.isEmpty()) return
-        val subscriptionSet = subscriptions.mapTo(mutableSetOf()) { it.parent.containingFile!! }
+        val subscriptionSet = subscriptions.mapTo(mutableSetOf()) { it.cf }
         val dependencies = Dependencies(
             aggregating = true,
             *subscriptionSet.toTypedArray())
         val generatedFileName = "AllSubscriptions${sourceSetName.replaceFirstChar { it.uppercaseChar() }}"
         val subscriptionsFile =
             codeGenerator
-                .createNewFile(dependencies, "moe.nea.firmament.annotations.generated", generatedFileName)
+                .createNewFile(dependencies, "moe.nea.firmament.annotations.generated.$sourceSetName", generatedFileName)
                 .bufferedWriter()
         subscriptionsFile.apply {
             appendLine("// This file is @generated by SubscribeAnnotationProcessor")
             appendLine("// Do not edit")
-            for (file in subscriptionSet) {
-                appendLine("// Dependency: ${file.filePath}")
-            }
-            appendLine("package moe.nea.firmament.annotations.generated")
+            appendLine("package moe.nea.firmament.annotations.generated.$sourceSetName")
             appendLine()
             appendLine("import moe.nea.firmament.events.subscription.*")
             appendLine()
+	        appendLine("@Suppress()")
             appendLine("class $generatedFileName : SubscriptionList {")
             appendLine("  override fun provideSubscriptions(addSubscription: (Subscription<*>) -> Unit) {")
             for (subscription in subscriptions) {
-                val owner = subscription.parent.qualifiedName!!.asString()
+                val owner = subscription.pQName.asString()
                 val method = subscription.child.simpleName.asString()
                 val type = subscription.type.declaration.qualifiedName!!.asString()
                 appendLine("    addSubscription(Subscription<$type>(")
@@ -64,7 +62,7 @@ class SubscribeAnnotationProcessor(
             dependencies,
             "META-INF/services/moe.nea.firmament.events.subscription.SubscriptionList", extensionName = "")
             .bufferedWriter()
-        metaInf.append("moe.nea.firmament.annotations.generated.")
+        metaInf.append("moe.nea.firmament.annotations.generated.$sourceSetName.")
         metaInf.appendLine(generatedFileName)
         metaInf.close()
     }
@@ -74,13 +72,15 @@ class SubscribeAnnotationProcessor(
         val child: KSFunctionDeclaration,
         val type: KSType,
     ) : Comparable<Subscription> {
+		val cf = parent.containingFile!!
+		val pQName = parent.qualifiedName!!
+	    val tName = type.declaration.qualifiedName!!
         override fun compareTo(other: Subscription): Int {
-            var compare = parent.qualifiedName!!.asString().compareTo(other.parent.qualifiedName!!.asString())
+            var compare = pQName.asString().compareTo(other.pQName.asString())
             if (compare != 0) return compare
             compare = other.child.simpleName.asString().compareTo(child.simpleName.asString())
             if (compare != 0) return compare
-            compare = other.type.declaration.qualifiedName!!.asString()
-                .compareTo(type.declaration.qualifiedName!!.asString())
+            compare = other.tName.asString().compareTo(tName.asString())
             if (compare != 0) return compare
             return 0
         }