-
Notifications
You must be signed in to change notification settings - Fork 40
Move build scripts to Kotlin #423
Move build scripts to Kotlin #423
Conversation
@jamesward Would you like to help review this PR? |
@martinbonnin , you might want to add an intermediate commit that renames |
f20c461
to
e93a839
Compare
Good call 👍 . I just did. Also makes it easier to review the diff with the Groovy version from that commit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I apologize for the delays.
Could you rebase this off latest?
Co-authored-by: Vladimir Sitnikov <[email protected]>
e93a839
to
71a968a
Compare
It should be good now |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you!
tagTemplate = 'v$version' | ||
git { | ||
requireBranch = /^release-v\d+.*$/ //regex | ||
tagTemplate = "v$version" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should have been "v\$version"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In #437
attributes( | ||
mapOf( | ||
"Implementation-Title" to project.name, | ||
"Implementation-Version" to version, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should have been project.version
rather than version
from a jar task (there's a version
property in jar
task)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll add it to #437; thanks!
I verified that releasing process still works and the staged artifacts look good (I've dropped them, so no new release right now). Thanks, everyone! |
@elefeint , I see you squashed the commits before merging. It causes broken history since Git can't detect that The intermediate commit was vital for proper git history, see my comment in #423 (comment). Would you please clarify if "rebase and merge" (with or without merge commit) was an option at all? |
This is a follow up from #398
This PR converts build scripts to Kotlin. I tried as much as possible to preserve the existing behaviour even if it's not really idiomatic at the moment.
This PR also bumps the Gradle version to 6.9. This is the last version that ships with the "maven" plugin and still supports Kotlin DSL.
Follow ups: