Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kotlin 1.8.20 #89

Merged
merged 4 commits into from
Apr 9, 2023
Merged

Kotlin 1.8.20 #89

merged 4 commits into from
Apr 9, 2023

Conversation

christophsturm
Copy link
Contributor

a more compact pr to fix the build on kotlin 1.8.20. based on #86

@TWiStErRob
Copy link
Contributor

TWiStErRob commented Apr 7, 2023

Tip: change base to #86's branch, so the diff is clear.

@@ -46,7 +46,7 @@ fun compile(
// black hole all writes
}
}
compilerPlugins = plugins.toList()
this.componentRegistrars = componentRegistrars.toList()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is the only breaking change, this can be supported both ways with trivial reflection, @bnorm?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only in the test sources, so that change would not matter.
I think it cannot work with 1.8.20 and 1.7 because the kotlin compiler apis that it compiles against are different.

Copy link
Contributor

@TWiStErRob TWiStErRob Apr 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that's the case, could the repo be updated to Kotlin Gradle Plugin 1.8, but keep the kotlinOptions.languageVersion and apiVersion at 1.7? This normally works with standard jars, not sure if a compiler plugin is different.

@christophsturm
Copy link
Contributor Author

Tip: change base to #86's branch, so the diff is clear.

Oh interesting I did not know that thats possible. Can I change it without recreating the pr? will that also change where a merge would go to? Anyway for this pr all the important changes are in one commit.

@TWiStErRob

This comment was marked as off-topic.

@christophsturm
Copy link
Contributor Author

Yeah, just press edit on top (how you would change the title), and select a different branch.

that does not work because it shows only branches in the main repo, and the kotlinter branch is in my fork of the repo.

If you do this you'll see that there is not just one commit as you intended ;)

really? IMO all commits that matter are in the "Kotlin 1.8.2" commit, except for the build script linting which is unrelated to the kotlin change

@TWiStErRob

This comment was marked as off-topic.

@christophsturm
Copy link
Contributor Author

Yeah that's what I meant, feels like that commit belonged in the base branch. Anyway, remember this feature, it could come in hand

yeah, thanks!

@bnorm bnorm merged commit 7bdf25f into bnorm:master Apr 9, 2023
@bnorm
Copy link
Owner

bnorm commented Apr 9, 2023

Woot! Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants