Fix issues when running with KSP2

[WhosNickDoglio]

We need changes from these PRs (square/kotlinpoet#1885 & square/kotlinpoet#1956) to fix an issue with KSP2.

https://github.com/square/kotlinpoet/releases/tag/1.18.0
https://github.com/square/kotlinpoet/releases/tag/1.18.1
https://github.com/square/kotlinpoet/releases/tag/2.0.0

Everything passes for me locally except the Gradle intergration tests that fail but those also fail on main in my testing. All non-dependency update changes were related to KspContributionMergerTest.typealiases are followed failing.

No new tests were added since currently none of the test suites run using KSP2.

Fixes #90

[ZacSweers]

@WhosNickDoglio I've only loosely been following, what's up with the two failing checks?

[WhosNickDoglio]

I've only loosely been following, what's up with the two failing checks?

The failing tests in "Gradle integration tests" fail on main for me and I couldn't get the "Instrumentation tests" test job to run on CI. I attempted to fix the actions/cache issue at one point but that pointed to a different issue with emulators and felt out of scope of this PR to get working.

[ZacSweers]

I'm happy to take PRs but I can't really take any that fail CI :/

[WhosNickDoglio]

I'm sorry I'm confused. Both the jobs failing are currently broken in main. Are you suggesting I fix these unrelated issues before my PR could be reviewed?

[ZacSweers]

Only the gradle integration test is failing in main. This PR appears to introduce a new failure.

Main

This PR

I'm willing to ignore the existing failure, but yeah, new failures aren't helpful unless I'm missing something about what's happening on main?

[ZacSweers]

Ok let me look at these, I see it's github actions failures now that I'm back at a computer

[WhosNickDoglio]

Thank you! That's probably my bad for not explaining that better in the PR description. If those are actually broken due to my changes I will fix them 👍