From 831d9ae37f7ddccf196a744d2e4b27a31a468ee0 Mon Sep 17 00:00:00 2001
From: 2BAB <xx2bab@gmail.com>
Date: Mon, 4 Apr 2022 20:58:17 +0800
Subject: [PATCH 1/5] fix: plugin name with hashcode invalidate the cache

Incremental processing will be disabled due to it
---
 .../kotlin/me/xx2bab/koncat/gradle/base/KoncatBasePlugin.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koncat-gradle-plugin/src/main/kotlin/me/xx2bab/koncat/gradle/base/KoncatBasePlugin.kt b/koncat-gradle-plugin/src/main/kotlin/me/xx2bab/koncat/gradle/base/KoncatBasePlugin.kt
index ad4d26b..779e997 100644
--- a/koncat-gradle-plugin/src/main/kotlin/me/xx2bab/koncat/gradle/base/KoncatBasePlugin.kt
+++ b/koncat-gradle-plugin/src/main/kotlin/me/xx2bab/koncat/gradle/base/KoncatBasePlugin.kt
@@ -20,7 +20,7 @@ class KoncatBasePlugin : Plugin<Project> {
             val argumentsContract = KoncatArgumentsContract(
                 projectName = project.name,
                 koncatVersion = BuildConfig.KONCAT_VERSION,
-                gradlePlugins = plugins.map { it.toString() },
+                gradlePlugins = plugins.map { it.toString().split("@")[0] },
                 declaredAsMainProject = baseExt.isMainProject.get(),
                 variantAwareIntermediates = baseExt.mainProjectOutputDir.get().asFile, // TODO: it may be consumed eagerly
             )

From 59cec8b67d17819c3085aea54336cb339c16da4d Mon Sep 17 00:00:00 2001
From: 2BAB <xx2bab@gmail.com>
Date: Mon, 4 Apr 2022 21:01:01 +0800
Subject: [PATCH 2/5] test: enable the ksp incremental log

---
 sample/gradle.properties | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sample/gradle.properties b/sample/gradle.properties
index d8cc43e..da46ce5 100644
--- a/sample/gradle.properties
+++ b/sample/gradle.properties
@@ -19,4 +19,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-org.gradle.caching=true
\ No newline at end of file
+org.gradle.caching=true
+
+ksp.incremental=true
+ksp.incremental.log=true
\ No newline at end of file

From 67e6431f3f05cc57f704916ac179b99f58e58eaf Mon Sep 17 00:00:00 2001
From: 2BAB <xx2bab@gmail.com>
Date: Mon, 4 Apr 2022 21:08:35 +0800
Subject: [PATCH 3/5] refactor: KONCAT_FILE_SEPARATOR ->
 KONCAT_STRING_SEPARATOR

---
 .../src/main/kotlin/me/xx2bab/koncat/contract/Constants.kt  | 2 +-
 .../me/xx2bab/koncat/contract/KoncatArgumentsContract.kt    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koncat-contract/src/main/kotlin/me/xx2bab/koncat/contract/Constants.kt b/koncat-contract/src/main/kotlin/me/xx2bab/koncat/contract/Constants.kt
index e34ac81..0dc6185 100644
--- a/koncat-contract/src/main/kotlin/me/xx2bab/koncat/contract/Constants.kt
+++ b/koncat-contract/src/main/kotlin/me/xx2bab/koncat/contract/Constants.kt
@@ -2,7 +2,7 @@ package me.xx2bab.koncat.contract
 
 const val KONCAT_FILE_EXTENSION = "koncat"
 const val KONCAT_PROCESSOR_ARGUMENT_KEY = "KONCAT."
-const val KONCAT_FILE_SEPARATOR = "\\0"
+const val KONCAT_STRING_SEPARATOR = "<@KONCAT@>"
 
 const val LOG_TAG = "[Koncat] "
 const val ARGUMENT_PARSE_ERROR = "Koncat arguments can not match due to %s"
diff --git a/koncat-contract/src/main/kotlin/me/xx2bab/koncat/contract/KoncatArgumentsContract.kt b/koncat-contract/src/main/kotlin/me/xx2bab/koncat/contract/KoncatArgumentsContract.kt
index 10208bf..8edf90e 100644
--- a/koncat-contract/src/main/kotlin/me/xx2bab/koncat/contract/KoncatArgumentsContract.kt
+++ b/koncat-contract/src/main/kotlin/me/xx2bab/koncat/contract/KoncatArgumentsContract.kt
@@ -47,12 +47,12 @@ class KoncatArgumentsContract {
         }
 
         for ((k, v) in koncatArgumentMap) {
-            logger.info("Koncat receives the argument: $k = $v")
+            logger.info("$LOG_TAG Koncat receives the argument: $k = $v")
         }
 
         projectName = koncatArgumentMap[KoncatArgument.PROJECT_NAME.name]!!
         koncatVersion = koncatArgumentMap[KoncatArgument.KONCAT_VERSION.name]!!
-        gradlePlugins = koncatArgumentMap[KoncatArgument.GRADLE_PLUGINS.name]!!.split(KONCAT_FILE_SEPARATOR)
+        gradlePlugins = koncatArgumentMap[KoncatArgument.GRADLE_PLUGINS.name]!!.split(KONCAT_STRING_SEPARATOR)
         declaredAsMainProject = koncatArgumentMap[KoncatArgument.DECLARED_AS_MAIN_MODULE.name]!!.toBoolean()
         variantAwareIntermediates = File(koncatArgumentMap[KoncatArgument.VARIANT_AWARE_INTERMEDIATES.name]!!)
     }
@@ -61,7 +61,7 @@ class KoncatArgumentsContract {
         val map = HashMap<String, String>()
         map[KoncatArgument.PROJECT_NAME.name] = projectName
         map[KoncatArgument.KONCAT_VERSION.name] = koncatVersion
-        map[KoncatArgument.GRADLE_PLUGINS.name] = gradlePlugins.joinToString(separator = KONCAT_FILE_SEPARATOR)
+        map[KoncatArgument.GRADLE_PLUGINS.name] = gradlePlugins.joinToString(separator = KONCAT_STRING_SEPARATOR)
         map[KoncatArgument.DECLARED_AS_MAIN_MODULE.name] = declaredAsMainProject.toString()
         map[KoncatArgument.VARIANT_AWARE_INTERMEDIATES.name] = variantAwareIntermediates.absolutePath
         return map.mapKeys {

From ed9571e85b2fcf2d9b63258b677ff513669c4536 Mon Sep 17 00:00:00 2001
From: 2BAB <xx2bab@gmail.com>
Date: Mon, 4 Apr 2022 21:09:39 +0800
Subject: [PATCH 4/5] test: upgrade the sample project to showcase the ksp
 Dependency usage

---
 ...ExportedAndroidLibraryExternalRunnable.kt} |   4 +--
 .../android/ExportedAndroidLibraryRunnable.kt |   2 +-
 .../ExportedPureKotlinLibraryRunnable2.kt     |  11 +++++++
 .../1.0/koncat-sample-lib2-1.0-sources.jar    | Bin 1910 -> 1927 bytes
 .../koncat-sample-lib2-1.0-sources.jar.md5    |   2 +-
 .../koncat-sample-lib2-1.0-sources.jar.sha1   |   2 +-
 .../koncat-sample-lib2-1.0-sources.jar.sha256 |   2 +-
 .../koncat-sample-lib2-1.0-sources.jar.sha512 |   2 +-
 .../1.0/koncat-sample-lib2-1.0.aar            | Bin 2128 -> 2135 bytes
 .../1.0/koncat-sample-lib2-1.0.aar.md5        |   2 +-
 .../1.0/koncat-sample-lib2-1.0.aar.sha1       |   2 +-
 .../1.0/koncat-sample-lib2-1.0.aar.sha256     |   2 +-
 .../1.0/koncat-sample-lib2-1.0.aar.sha512     |   2 +-
 .../1.0/koncat-sample-lib2-1.0.module         |  30 +++++++++---------
 .../1.0/koncat-sample-lib2-1.0.module.md5     |   2 +-
 .../1.0/koncat-sample-lib2-1.0.module.sha1    |   2 +-
 .../1.0/koncat-sample-lib2-1.0.module.sha256  |   2 +-
 .../1.0/koncat-sample-lib2-1.0.module.sha512  |   2 +-
 .../koncat-sample-lib2/maven-metadata.xml     |   2 +-
 .../koncat-sample-lib2/maven-metadata.xml.md5 |   2 +-
 .../maven-metadata.xml.sha1                   |   2 +-
 .../maven-metadata.xml.sha256                 |   2 +-
 .../maven-metadata.xml.sha512                 |   2 +-
 .../kotlin/ExportAnnotationProcessor.kt       |  16 +++++++---
 .../koncat/sample/kotlin/ExportMetadata.kt    |   5 ++-
 25 files changed, 62 insertions(+), 40 deletions(-)
 rename sample/android-lib-external/src/main/java/me/xx2bab/koncat/sample/android/{ExportedAndroidLibraryRunnable2.kt => ExportedAndroidLibraryExternalRunnable.kt} (51%)
 create mode 100644 sample/kotlin-lib/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportedPureKotlinLibraryRunnable2.kt

diff --git a/sample/android-lib-external/src/main/java/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryRunnable2.kt b/sample/android-lib-external/src/main/java/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryExternalRunnable.kt
similarity index 51%
rename from sample/android-lib-external/src/main/java/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryRunnable2.kt
rename to sample/android-lib-external/src/main/java/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryExternalRunnable.kt
index d5a21d8..3eaf30d 100644
--- a/sample/android-lib-external/src/main/java/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryRunnable2.kt
+++ b/sample/android-lib-external/src/main/java/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryExternalRunnable.kt
@@ -3,8 +3,8 @@ package me.xx2bab.koncat.sample.android
 import me.xx2bab.koncat.sample.annotation.ExportAPI
 
 @ExportAPI
-class ExportedAndroidLibraryRunnable2: Runnable {
+class ExportedAndroidLibraryExternalRunnable: Runnable {
     override fun run() {
-        println("ExportedAndroidLibraryAPI2 is running...")
+        println("ExportedAndroidLibraryExternalRunnable is running...")
     }
 }
\ No newline at end of file
diff --git a/sample/android-lib/src/main/kotlin/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryRunnable.kt b/sample/android-lib/src/main/kotlin/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryRunnable.kt
index bb188f4..c576ef2 100644
--- a/sample/android-lib/src/main/kotlin/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryRunnable.kt
+++ b/sample/android-lib/src/main/kotlin/me/xx2bab/koncat/sample/android/ExportedAndroidLibraryRunnable.kt
@@ -5,6 +5,6 @@ import me.xx2bab.koncat.sample.annotation.ExportAPI
 @ExportAPI
 class ExportedAndroidLibraryRunnable: Runnable {
     override fun run() {
-        println("ExportedAndroidLibraryAPI is running")
+        println("ExportedAndroidLibraryAPI is running...")
     }
 }
\ No newline at end of file
diff --git a/sample/kotlin-lib/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportedPureKotlinLibraryRunnable2.kt b/sample/kotlin-lib/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportedPureKotlinLibraryRunnable2.kt
new file mode 100644
index 0000000..b7bb5a8
--- /dev/null
+++ b/sample/kotlin-lib/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportedPureKotlinLibraryRunnable2.kt
@@ -0,0 +1,11 @@
+package me.xx2bab.koncat.sample.kotlin
+
+import me.xx2bab.koncat.sample.annotation.ExportAPI
+
+@ExportAPI
+class ExportedPureKotlinLibraryRunnable2 : Runnable {
+    override fun run() {
+        println("ExportedPureKotlinLibraryAPI2 is running...")
+    }
+}
+
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar
index 0bbe4432bdc5afbede8e63229c9afd5a552f504d..411a2b647d9334fa3e38173cb48c4213ccaa95eb 100644
GIT binary patch
delta 275
zcmeyy*UrDel9}&C+s&le3=9lhj0_B(43jsqDNVLx7pr%zC`m2KOUwx>&C5$n%1PDB
zF6r$t<U3>_z*4>c(G;!Bn1G;(O-!9kADfGF76s4QTv|3k@YH=p7MJ!LSz)_pb=+;(
z+kEk5kQrOA98>v>(nE$-%O|d7+2nOmqWOuuJ)fj8>$TsTY;Iq6TzPl8b-(7pTXS>6
z-%jjVaOaz<b>bKO=be(h<<UO`?ugn5uk&kJ(|r1fg7EdT)e%Ci7S-!k|9|3;8E8<r
ze(Snf)6>H~GfzItBD2|^<scI;ihm~avb$?y@k)R<D;v<y4BSBI!py*+%L3v70FsSt
AYXATM

delta 258
zcmZqY|Hik$l9{hb^Y4-w3=9n4f!K**@&Q(*$(hVz^+Bb1d5K9msYZI)CAGe`{7nV|
zcYkZ^`D`djD4BHd;E{tr_}6Wj#QpSEO!q;Ff4dc=#2?STclvkNjc+$BCFaaqc5A`K
z+6Q8r{VZJGn{1lu5T+@WG~ti>amD0i2Ywl>J^8FAB<ugvwa2F<Ts~)Z`%P!hf;;-k
z#!~NJ$<}Dti0E*rnyWiqJ6M`BVdCjmxobL{=Gaa@`u^(Et!!S|y`9!;O9S`r+B|Fi
qWPVne&7Ld=nRrorF<G45T?yF(0p6@^K<_bd1EDQ51A{UPhz9`nlx#2n

diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.md5 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.md5
index dd1e539..c2026ce 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.md5
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.md5
@@ -1 +1 @@
-a918d3a03335223b04be41fa88e41ad9
\ No newline at end of file
+db6efe85432f2376d86a0d362a050056
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha1 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha1
index 63a76aa..9404517 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha1
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha1
@@ -1 +1 @@
-b18f9f7159bc26b7f0373b6289bee4a91555d48d
\ No newline at end of file
+b7cce7a652357bc1831daedd90f2f8fbdac5f304
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha256 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha256
index 82aaa4a..07735b0 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha256
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha256
@@ -1 +1 @@
-6928ce7fe9caaa2467c338e4af9636990d5760d18229d25b883a9f937b91ad85
\ No newline at end of file
+fad543449f3a21305fb163a035cba7351f2814fa7edb6eeeec6d9f1eddb8c5cb
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha512 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha512
index 073e2e1..af2681d 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha512
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0-sources.jar.sha512
@@ -1 +1 @@
-b697b895f649c54e8be2661402e79c715fabf94dd5321c5dce41ec65ae84cdd2ee708815dd8af603b860ec85b20239a4f66b2c177d987087bea962962b361cd6
\ No newline at end of file
+1197e79e9b0f653a5fff63f3149f0ad4d6a128144fbb02959ffc5a059b97aa1999627bb54388f6cc6e476dda42f8bf2c5a1f34e2517b81a21c7e6b3d1c5def93
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar
index aaca42f243e304cf36b0e467d370b500cd549f36..10c8f9fdd7add2a7e940179d6b1cb746245463f6 100644
GIT binary patch
delta 1423
zcmV;A1#tS%5Z4f}6#)v^!d2y31pojJ2a_KG9e<|RBH^2inHU(3GBYsv07Y|C^(!ij
zk`j~jv-9(k6HD}q6LSl4QuPz_Qi}33Q}kUc3i69eQd1lue4osuqQs&~*NT$VqP)bM
zpwhg&#H5^5z2uz4;^MVImifYtBLC8A_4x|tSg1Vg*!k9B&rTIC<{*d8q%AUsPV{n{
zWPkS`I<kB7#d8)#yZ(r2MQJ!JatQRQ6M3{YSCC0WQ{&lO<NMX0_kRC-{CYlv*@i<K
zWI56eB0leU{>AC)!($h1ZhUV&9BR&$di|!<oA!x<ch63I@1_6f;=^kPIy?&hm&R+p
z`>DiyEa1jt_B$VU-YSi&s$P_A<Y6G<zkhi7_F$fu?LnTOXD9})-1g~&Lbh_JjPs>E
zlV>F!|7*YY>Pn|8;pw-s<+7BUc=Uqw-blAivi3Q3p;FW{b(Wft&5GxN2SWHJYZ&Fs
zSsxYo$|y8A=<T(vtvYEE%l<RYJ*eZHX3zKIO4Q0n|4zo*s-^OMHq%RNOg#0r^?%s(
zQ<Zu=?~4w<j1DW9u)uOt#FAu2wrh)jI2@Dnz5Z&Q(HePq(cJ8FQge0YHl@nTpOuwg
z8>#)q^VO5uSxV<OwH|5OI_b_#+n*Esj{0AhNV~JY-Mw|?xv3uorq#aG?Kb4hSANL7
zj@9{VP0rP-BekD0Z!A@xye{OCtAG6mmoIAPE<W3l*#28r?&J-5_P1#_`mK_pkDaq&
zl$7k4c4gA0*<P(}(vn)ep%GjBwxk_tah>(8`-$zRYss@bmQUMv;Gc!hef7-A%M@(A
zl4q{@^Fl~(g6RK>N8$&X6%{7@Zh4vX(pYaktLKHIIz{^%pBz&V%W~ey(trMC@eDVu
zf~~zS%-5wNau)QwPI=_UY+ksUcUhry`7Mv^C#LVRQcTrMw4|=i4?szr8+J>6OlM?Z
zPz5GXJ0cQiPG*vRDl{qTJC$bUq&Vm2rDdi=lH=ToC;gZl1={{k3T64uTgzygW+lb%
z*26jbh=r1)!a?qrjbhQW<$sKM+OB^}d32Ed!@?e09=&w^ssFP6)!2sq{rK}6-vf@@
znl2mW9dKis-4d}fCL@fa#QTIutnHVb-=brBU5+eqjM%Er^|fa2-IY(fr~mZY8GJT=
zD(C5M%=OQF3h$<y?^7?epYAekf|iN?o1o<v*G-*#L+ObB(rN!B6@NEvzOCfao#!tg
zmb22e)TE&0`hz~9#`ABBu0EQ_Q*o>3*Y_e1i;e6}y~o@6%5N-Qz57nOvt30{Q{mmu
zF*lRFtbBTEA7-wLNK^?u-&3Ui+w!xs`MVRZyNV?_#Q)c9ZeqN2B4J*^pZnZBpUU~K
zpKE^ctL1Ow2B+Dgw|~}LNb}8|wlVU)nbRR*uMZ0kFs2FQ*f!}b>X`ZTIPY17M2pUw
z@_v%@ejm;(UX&mZEbi0pE79?GZ&RGwMAzWQlhb6pmn}QYFm0pIzE3J!zp<i5;eqdG
zW(fm%5<qMW#J;W}j=G+HZm>Ah1;&{!EY9MKQgc!hi&OQo^M6ZnGV|hd^HWN5Qj-%B
z64HQ}CCQ9UBOvKQ5(5LO9hW5b_yhxakwB~t#Mq1mGC&2FURH5_o*pFitPb;9t8qeK
ztB~h|PS~cduv5NQSFbSe^76TK`rLVMKb?!(erI$~cwY5B<E?q>ywAmA*42K#g)JXy
zjV5;qb!)|HdshW@e-bKg^7{NqXmU}|)TC_20B=Sn24>u)D-3LFWT0|ci*7S|)<M`j
zmx<Dh1hPwl0e2iDKmrR{F^+BldITfD5f-AOJHVTj4Wxwy2<HGpCWaNn1G9n#C;<xC
d!d2y31pojJ2a~i1NdbzJ{s&A3Ee8Mq006e{_s;+T

delta 1425
zcmV;C1#bG+5YP~?6#)v;KTC2`1pom129qBF9e*aNQ!n<IF)=VKVP;@(1&ZdT>Q_`4
zB_$^5XXoc7Czj|JC*~I9r0OT;r4;37rs%s?6yz6`q^3AR_&%9QMTtd~L8W<liAg!B
zMtaFPiN(cBgFN$v4MqOhM5;*!&05Btd(-LWB`2fYt|N*%TpTVJ7(^ZSerd4j483!v
zVt>`f;HBIDiTTAmWDsH(`Ff(?X^-crpcO|NoA1ASfAfBI{Qla1Ob^7uB;U0klI3}2
z_x*0%6018qX0`8bEZF(#*u*!x`q_2|=D2LP{AT;|xXr!#o8eu*8&}*;;5jP0@A%z@
z)w$nW_bXc+bL(38Mf=y{J8o@?)$UrE?|%%JXq}$TdgFwphw}LeX8B9fGOGUnT*l^j
zytedB?AzL0myE|IPZ#Y=oblDoQ*x*D#*k&XNe2(RF}nIZHS82}e)`1hY;V|Jozj_B
z8Y{PDZ;j$J=DDnX;O30v4ds&^9L~>NTTw4`)k9*&@up_uh?E(hswQ$SDVooDcz^eu
zf?r*t@0Mmn=?LC*X=wbaVK<@E-FVBcY@XMLn<piojeb0NaqyNo4-fwNupn>kCia<!
zw?}r_oD~i3zLxdt<ei7RbJTW5rO){IZ=Q(hGP~z}66@J6t?z0S-1z9=>j;*n?1LM=
z^gCXuaw++hcxCA=Pk*hCd*pv9)qhP@$+X|I;&8LC-036sTvl&a$d?~Uo@v3|l9Hlf
zwshK*TrE+_yp$y-*AgyXx?m*8DwcUmX_EPgX#XFIb0dGUJpZdvJ9&xotfmspZmr1H
zLP5WYQ)@~esULVNs4(Gw!^=x=+~?TxO<HtF=F|ShC;bjOSKNwN^<M7gtbf1q;E!04
zZcN6*B<|E0C1G#fm}66Q4SHAa*w(tn&GGRrH@{@3#fvunkqtmem>YIWeoSX%U{D1n
zPCFtJW=>|3eriQYYEfQdj=ocAW=@K8eqLH;IwVETop{oZ$x)!~|D;fs@4U5)rfF7E
z{BAv*vyWIPIVv3Fe%UA%J%3xyn5XUfr<6wr**`4ovE|WA*Pr??>tBs+=--b&zwtfb
zxUK23Vcr2Zrr9kKD`PUkI7+-vh{W1{+4(Ixrq|`j632+G`dnXY_TF9jw0rtbubshX
z<EL_-{>EJY%%|{fy7@l!Qv2yH(<W${=)VbCesSH@$v2da_%EIIPk&Nz)8^YsF5P+l
z0%AEUT}w?0TCP9n6KXvFw&?1kc{~-jdVYN`^03&*-qd@%ov-}H;?=wFq&wSH1T_`j
z{Ty>M*~`kOr}kmyx`;%T(DOY->c1^NJDa~d@w%&6l0*D|&E_V?OD7WM75ur+-SerO
z|N6P+7r$EmHg0g5Eq{7z&4o1I+-Vyl@0&Rt688GA@Bm|)K#pyb&Z3T)PmlASRY<hx
zyeaP|Iq&!3%;H4}0>R=w?Y<HnZ}&FEsZDeZempr%#(UYa!wl0l3hn!(vh^D)Y7`#$
zerA?1kS77e#z5@r8sezy>E{NEGhJYu>B8bHz9=;(HL*BVFMm6~BquX3J~uz5G$%DV
zAt50Rh*^@%*fau?E+jE9pxWVgL~wyOkQWHV>OhRmXdnYrXz67Y=jZ7`QqSrzueBN{
z^tB3kK7?%Q3OnU{b@d7ZFE5`<r_Y`D_S3nj?RQ4^gy&W7Gv1n~&ih;}X4UrdEo}Kv
zYc#n_s9USq>s9k7p~*!-y;G9183Vi-nHZRHm#8qXt&xFR<tw_C=y?TU<xD0@a}LNZ
z2?pGeiU2VzWJNK$1?Vw~00&rzj^6-pRyL3p79gAo44D8{5Dx%QO9KRx;0GGBs0IlE
f3erDIa#IBW0Q&}$y9Y@DgOddaOa>+g00000Qmy0a

diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.md5 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.md5
index 51df429..9a00bf9 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.md5
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.md5
@@ -1 +1 @@
-d3e4ed3931b14f36a59bac36d9db02c6
\ No newline at end of file
+d57118295d7758b3529d7e7c0e13b289
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha1 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha1
index c3f793f..f460e29 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha1
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha1
@@ -1 +1 @@
-7ccc739654cbb0f86643c967c1e881a53ef9e896
\ No newline at end of file
+24a478cf198244465d7550d69015f7efd66bf3b7
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha256 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha256
index 2446591..9bb2d29 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha256
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha256
@@ -1 +1 @@
-b370f6ffc354178d656568bba4066e52a1360a3c1cd01830bfde2e65a1553ea3
\ No newline at end of file
+9b40b12b4aa08808adbcbbb5161d62a693d1e44146f362a9d3919eaf146565ae
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha512 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha512
index fd2fbeb..90ff747 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha512
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.aar.sha512
@@ -1 +1 @@
-c50f2822fa0c6ddf354ad89c9acd7891f2e6d812ad670b103117f1a9f5d350fa7a0945c5e0229747b3ba6ea0a6b69cf39f4995c79fe1b7b6c06a6a4522ee8b85
\ No newline at end of file
+40181afb95227f3a67ebde9f764c19db651236a52bb131daa322e89fe9b92c373a3c988a272bb29d176b850775715dc52fc48557f88c6fcc8facdbd77c44fd02
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module
index e71ae2d..6b7175e 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module
@@ -26,11 +26,11 @@
         {
           "name": "koncat-sample-lib2-1.0.aar",
           "url": "koncat-sample-lib2-1.0.aar",
-          "size": 2128,
-          "sha512": "c50f2822fa0c6ddf354ad89c9acd7891f2e6d812ad670b103117f1a9f5d350fa7a0945c5e0229747b3ba6ea0a6b69cf39f4995c79fe1b7b6c06a6a4522ee8b85",
-          "sha256": "b370f6ffc354178d656568bba4066e52a1360a3c1cd01830bfde2e65a1553ea3",
-          "sha1": "7ccc739654cbb0f86643c967c1e881a53ef9e896",
-          "md5": "d3e4ed3931b14f36a59bac36d9db02c6"
+          "size": 2135,
+          "sha512": "40181afb95227f3a67ebde9f764c19db651236a52bb131daa322e89fe9b92c373a3c988a272bb29d176b850775715dc52fc48557f88c6fcc8facdbd77c44fd02",
+          "sha256": "9b40b12b4aa08808adbcbbb5161d62a693d1e44146f362a9d3919eaf146565ae",
+          "sha1": "24a478cf198244465d7550d69015f7efd66bf3b7",
+          "md5": "d57118295d7758b3529d7e7c0e13b289"
         }
       ]
     },
@@ -62,11 +62,11 @@
         {
           "name": "koncat-sample-lib2-1.0.aar",
           "url": "koncat-sample-lib2-1.0.aar",
-          "size": 2128,
-          "sha512": "c50f2822fa0c6ddf354ad89c9acd7891f2e6d812ad670b103117f1a9f5d350fa7a0945c5e0229747b3ba6ea0a6b69cf39f4995c79fe1b7b6c06a6a4522ee8b85",
-          "sha256": "b370f6ffc354178d656568bba4066e52a1360a3c1cd01830bfde2e65a1553ea3",
-          "sha1": "7ccc739654cbb0f86643c967c1e881a53ef9e896",
-          "md5": "d3e4ed3931b14f36a59bac36d9db02c6"
+          "size": 2135,
+          "sha512": "40181afb95227f3a67ebde9f764c19db651236a52bb131daa322e89fe9b92c373a3c988a272bb29d176b850775715dc52fc48557f88c6fcc8facdbd77c44fd02",
+          "sha256": "9b40b12b4aa08808adbcbbb5161d62a693d1e44146f362a9d3919eaf146565ae",
+          "sha1": "24a478cf198244465d7550d69015f7efd66bf3b7",
+          "md5": "d57118295d7758b3529d7e7c0e13b289"
         }
       ]
     },
@@ -82,11 +82,11 @@
         {
           "name": "koncat-sample-lib2-1.0-sources.jar",
           "url": "koncat-sample-lib2-1.0-sources.jar",
-          "size": 1910,
-          "sha512": "b697b895f649c54e8be2661402e79c715fabf94dd5321c5dce41ec65ae84cdd2ee708815dd8af603b860ec85b20239a4f66b2c177d987087bea962962b361cd6",
-          "sha256": "6928ce7fe9caaa2467c338e4af9636990d5760d18229d25b883a9f937b91ad85",
-          "sha1": "b18f9f7159bc26b7f0373b6289bee4a91555d48d",
-          "md5": "a918d3a03335223b04be41fa88e41ad9"
+          "size": 1927,
+          "sha512": "1197e79e9b0f653a5fff63f3149f0ad4d6a128144fbb02959ffc5a059b97aa1999627bb54388f6cc6e476dda42f8bf2c5a1f34e2517b81a21c7e6b3d1c5def93",
+          "sha256": "fad543449f3a21305fb163a035cba7351f2814fa7edb6eeeec6d9f1eddb8c5cb",
+          "sha1": "b7cce7a652357bc1831daedd90f2f8fbdac5f304",
+          "md5": "db6efe85432f2376d86a0d362a050056"
         }
       ]
     }
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.md5 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.md5
index f480a42..3743ca5 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.md5
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.md5
@@ -1 +1 @@
-26d5b84b4e5231ed20835515e9489980
\ No newline at end of file
+7de8f6969db7351fb020984752a0b8b0
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha1 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha1
index 319c91c..1d0130a 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha1
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha1
@@ -1 +1 @@
-8d90d03a7034e4156e907707e8020fb51a51b018
\ No newline at end of file
+d5e7ace6eb7d8a6b82263a14d09cc95fef298857
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha256 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha256
index f89fb5b..c85d3d8 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha256
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha256
@@ -1 +1 @@
-4ef954cdb03b3ea3b4d1cf81c17b434849ace65875041b3456d180a6bdaabac1
\ No newline at end of file
+fc6d76b49e43b980a67db49ecf148d359224123b81339c7648502ffbe55f60d0
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha512 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha512
index 1789445..226d1c3 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha512
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/1.0/koncat-sample-lib2-1.0.module.sha512
@@ -1 +1 @@
-39114f6eb3ff1ca07caaa6466ed851a5c393b96eafd0dd2f0f7f72cb540a0c6bc354a5ffab113471eab13d12ec712905dd599e1ce2c4c2b60c49e17f8dc9f501
\ No newline at end of file
+c950acd6cc1f4ea9bc54f052e5137039e54c82475b3f6696c61030281e0d927bebc00d5601642e97ecbd9c254fbe77eb83c1fbfc9503db60aca1390b8915f8f9
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml
index a1f53b7..0527ea4 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml
@@ -8,6 +8,6 @@
     <versions>
       <version>1.0</version>
     </versions>
-    <lastUpdated>20220331064103</lastUpdated>
+    <lastUpdated>20220404021729</lastUpdated>
   </versioning>
 </metadata>
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.md5 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.md5
index b2dc8ee..8a8e8b3 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.md5
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.md5
@@ -1 +1 @@
-762ce58486f74beacf1914390c43c23c
\ No newline at end of file
+5a5f841d29a108fd9a60a34f61ddbea6
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha1 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha1
index dc2aebf..8f9fe66 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha1
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha1
@@ -1 +1 @@
-92aa2640d89c2d1b6347808288ce2d05b70b5d84
\ No newline at end of file
+22d46a565af0f83035db384f240f658424c62d40
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha256 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha256
index 957a69e..24d7c4b 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha256
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha256
@@ -1 +1 @@
-aeb3f1dc3665d60a7f1a183fca27c45b0c73a5bd11ddfa4ca9718a2b7e449f17
\ No newline at end of file
+9985ed947d48d7f7d9210d1cb50d22c9701e6f34bf1c072907262193abfc8c87
\ No newline at end of file
diff --git a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha512 b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha512
index edb0c26..6898c05 100644
--- a/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha512
+++ b/sample/localm2/repository/me/2bab/koncat-sample-lib2/maven-metadata.xml.sha512
@@ -1 +1 @@
-7fcec7ee04d0dc497012d750226d40b85850a0522446e1aa73946380be542c678a018c395c0be8a1aa9a247a3538b4407f2db4a7434344a2b8de1171031b9665
\ No newline at end of file
+fd4b320f87f44c43945133b1f2460625851138baa76f09608d46bebdb0a9218d4e813cae948e012b2e444f6f39fedc4594e03fe9f703cdef4f79030fe7920005
\ No newline at end of file
diff --git a/sample/processors/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportAnnotationProcessor.kt b/sample/processors/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportAnnotationProcessor.kt
index e9bdaf5..2473986 100644
--- a/sample/processors/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportAnnotationProcessor.kt
+++ b/sample/processors/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportAnnotationProcessor.kt
@@ -38,6 +38,7 @@ class ExportAnnotationProcessor(
     private var exportMetadata = ExportMetadata()
 
     override fun process(resolver: Resolver): List<KSAnnotated> {
+        logger.info("$LOG_TAG [process]")
         val symbols =
             resolver.getSymbolsWithAnnotation("me.xx2bab.koncat.sample.annotation.ExportAPI")
         val ret = symbols.filter { !it.validate() }.toList()
@@ -50,6 +51,7 @@ class ExportAnnotationProcessor(
     @OptIn(KotlinPoetKspPreview::class)
     override fun finish() {
         super.finish()
+        logger.info("$LOG_TAG [finish]")
         if (koncat.isMainProject()) {
             logger.info(
                 LOG_TAG + "Query all sub projects meta data from "
@@ -71,11 +73,11 @@ class ExportAnnotationProcessor(
             all.addAll(subProjectMetadataList)
             // Generate the final file
             val fileSpec = RouterClassBuilder(all).build()
-            fileSpec.writeTo(codeGenerator, Dependencies(aggregating = false))
+            fileSpec.writeTo(codeGenerator, Dependencies.ALL_FILES)
         } else {
             // Generate intermediate JSON file
             val os = codeGenerator.createNewFile(
-                Dependencies(aggregating = false),
+                Dependencies(aggregating = true, *exportMetadata.mapKSFiles.toTypedArray()),
                 "",
                 koncat.projectName + "-export",
                 "json.$KONCAT_FILE_EXTENSION"
@@ -85,12 +87,18 @@ class ExportAnnotationProcessor(
         }
     }
 
+    override fun onError() {
+        super.onError()
+        logger.info("$LOG_TAG [onError]")
+    }
+
     inner class BuilderVisitor() : KSVisitorWithExportMetadata() {
         override fun visitClassDeclaration(
             classDeclaration: KSClassDeclaration,
             data: ExportMetadata
         ) {
-            data.exportAPI.add(classDeclaration.qualifiedName!!.asString())
+            data.exportAPIs.add(classDeclaration.qualifiedName!!.asString())
+            classDeclaration.containingFile?.let { data.mapKSFiles.add(it) }
         }
     }
 
@@ -101,7 +109,7 @@ class ExportAnnotationProcessor(
             val routerInterface = ClassName("me.xx2bab.koncat.sample", "ExportCapabilityRouter")
             val list = ClassName("kotlin.collections", "List")
             val listOfString = list.parameterizedBy(String::class.asTypeName())
-            val exportAPIs = dataList.flatMap { it.exportAPI }
+            val exportAPIs = dataList.flatMap { it.exportAPIs }
                 .map { "\"$it\"" }
                 .joinToString(separator = ", ")
 
diff --git a/sample/processors/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportMetadata.kt b/sample/processors/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportMetadata.kt
index c62f298..dc89472 100644
--- a/sample/processors/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportMetadata.kt
+++ b/sample/processors/src/main/kotlin/me/xx2bab/koncat/sample/kotlin/ExportMetadata.kt
@@ -1,8 +1,11 @@
 package me.xx2bab.koncat.sample.kotlin
 
+import com.google.devtools.ksp.symbol.KSFile
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 @Serializable
 data class ExportMetadata(
-    val exportAPI: MutableList<String> = mutableListOf()
+    val exportAPIs: MutableList<String> = mutableListOf(),
+    @Transient val mapKSFiles: MutableList<KSFile> = mutableListOf()
 )

From 97fa765a1e39aac9fbbdb7d4a2f45305bf0d0443 Mon Sep 17 00:00:00 2001
From: 2BAB <xx2bab@gmail.com>
Date: Mon, 4 Apr 2022 21:10:28 +0800
Subject: [PATCH 5/5] release: 1.0.1

---
 deps.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps.versions.toml b/deps.versions.toml
index 9fe3e9c..b8788c1 100644
--- a/deps.versions.toml
+++ b/deps.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-koncatVer = "1.0.0"
+koncatVer = "1.0.1"
 kotlinVer = "1.6.10"
 agpVer = "7.1.2"
 agpBetaVer = "7.2.0-beta04"