Finally managed to upgrade Whetstone to #Kotlin 1.9.0, huge thanks to the Kotlin team for triaging my KAPT bug report and suggesting an easy workaround.

github.com/msfjarvis/whetstone