Add support for Gradle Kotlin DSL #9353

mgorniew · 2020-05-15T16:20:41Z

Hi,

This will add support for Kotlin DSL in Quarkus Gradle tools.

It will also fix #5776

geoand · 2020-05-15T16:30:49Z

Thanks a lot for this!

@maxandersen @aloubyansky I think you'll probably want to check this out

...est/resources/add-extension-multi-module-kotlin-dsl/gradle/wrapper/gradle-wrapper.properties

aloubyansky · 2020-05-15T16:40:43Z

Thanks @mgorniew

gsmet · 2020-07-10T14:27:08Z

@aloubyansky what's the status of this one? It has a lot of conflicts now unfortunately :/

aloubyansky · 2020-07-10T14:51:10Z

We need to rebase this. @mgorniew sorry, I am not sure why I didn't merge it, tbh. If you could rebase it, it'll be much appreciated, if not then I'll look into this.

mgorniew · 2020-07-10T14:55:43Z

I will rebase this tomorrow. pt., 10 lip 2020, 16:51 użytkownik Alexey Loubyansky < [email protected]> napisał:

…

We need to rebase this. @mgorniew <https://github.com/mgorniew> sorry, I am not sure why I didn't merge it, tbh. If you could rebase it, it'll be much appreciated, if not then I'll look into this. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#9353 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADIDQ4ZHDISEN4TJQOH5DE3R24TG5ANCNFSM4NBWUIFA> .

aloubyansky · 2020-07-10T15:01:40Z

@ia3andy fyi gradle kotlin dsl support
Thanks a lot @mgorniew

aloubyansky · 2020-07-10T15:06:29Z

...s/gradle/src/functionalTest/resources/add-extension-multi-module-kotlin-dsl/build.gradle.kts

+
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8


I think you should remove this, since our CI will be also testing it under Java 11. And I remember we had issues with Kotlin and Java 14. If you run into that, the tests may need to be disabled for that version.

See https://github.com/quarkusio/quarkus/blob/master/integration-tests/gradle/build.gradle#L42

ia3andy · 2020-07-10T17:56:49Z

Just as a quick note, everything related to generating new project using Kotlin DSL is going to be replaced by the new codestart system, so we will soon need to implement it there too:
#10372

gsmet · 2020-07-29T10:17:00Z

@aloubyansky this one got outdated again. Maybe you could sync with @mgorniew at the beginning of the 1.8 cycle?

ia3andy · 2020-07-29T10:25:27Z

@gsmet Or.. we could wait for #10372 to be merged, and add the kotlin-dsl buildtool codestart to it. It will be available from the Maven plugin using -DcodestartsEnabled.

aloubyansky · 2020-07-29T10:41:50Z

Looking at my emails I don't see a notification of the pushed update. That is strange. But explains how I missed it. Sorry again @mgorniew At this point though I would take @ia3andy's suggestion. @mgorniew you've got all the reasons to lose your motivation by now. Sorry about that. In case you still would like to get this feature in, please let @ia3andy know. We need it for sure.

ia3andy · 2020-07-29T13:20:37Z

@mgorniew it would be a pleasure to help you to add kotlin dsl as a codestart.. let me know :)

mgorniew · 2020-07-29T13:35:38Z

@ia3andy I think best way is to wait now for #10372 merge. Then I can rebase this PR and add kotlin dsl to codestart. I didn't have time yet to look at codedstart, so for now I've only have one question. With#10372, does all changes made in this PR are still valid and I should just add something more to support codestart? Or some functionality was moved entirely to codestarts, eg. templates from platform-descriptor-json?

ia3andy · 2020-07-29T13:46:14Z

@ia3andy I think best way is to wait now for #10372 merge. Then I can rebase this PR and add kotlin dsl to codestart. I didn't have time yet to look at codedstart, so for now I've only have one question. With#10372, does all changes made in this PR are still valid and I should just add something more to support codestart?
Or some functionality was moved entirely to codestarts, eg. templates from platform-descriptor-json?

The goal with codestarts is to replace all the current codegen (templates from platform-descriptor-json), but we don't plan to migrate in one shot, the current templates will be the default until this is stable enough. So instead of having the Kotlin DSL as part of the future "legacy" codegen, I think it makes sense to have kotlin DSL as experimental in the codestarts to start. It could also be a way to make people use the codestarts so we gather some feedback :)

mgorniew · 2020-07-29T13:54:58Z

@ia3andy ok, so I will keep plugins changes (to add/remove extensions, etc.) and move templates/project bootstrapping code to codestarts.

ia3andy · 2020-07-29T13:55:56Z

Yes you need to keep the code the Add/Remove code, this is meant to be kept!

aloubyansky · 2020-07-29T14:08:04Z

thanks @mgorniew

ia3andy · 2020-08-03T12:17:31Z

@mgorniew Codestarts are merged :)

I think that kotlin DSL codestart will be really close to the gradle one:
https://github.com/quarkusio/quarkus/blob/master/devtools/platform-descriptor-json/src/main/resources/bundled-codestarts/buildtool/gradle/base/build-layout.include.qute

Let me know if you have questions..

mgorniew · 2020-08-03T12:24:02Z

@ia3andy Ok, thanks. I will look at this and try to update this pull request tomorrow.

mgorniew · 2020-08-05T21:38:33Z

@aloubyansky @ia3andy I've made changes required to support codestarts, please review.

I've found two possible issues:

Scala codestart has dependency "org.scala-lang:scala-library:${version.scala}" and "${version.scala}" doesn't not resolve. For Groovy build files is is changed to "undefined", but this still works - probably because this dependency is managed. With kotlin dsl this property will fail at build file parsing. I've changed this "org.scala-lang:scala-library" in gradle-kotlin-dsl codestart. But I'm not sure if this ok.
addExtension task will also add platform bom even if "enforcedPlatform(...)" is there already. Should this work in that way?

ia3andy · 2020-08-06T06:58:45Z

@aloubyansky @ia3andy I've made changes required to support codestarts, please review.

I've found two possible issues:

Scala codestart has dependency "org.scala-lang:scala-library:${version.scala}" and "${version.scala}" doesn't not resolve. For Groovy build files is is changed to "undefined", but this still works - probably because this dependency is managed. With kotlin dsl this property will fail at build file parsing. I've changed this "org.scala-lang:scala-library" in gradle-kotlin-dsl codestart. But I'm not sure if this ok.

This was a mistake and will be fixed with: 62312d3 (#11235)

addExtension task will also add platform bom even if "enforcedPlatform(...)" is there already. Should this work in that way?

I think that's a bug, why would we add it multiple time?

@mgorniew also note that in the commit I inverted version to name.version instead of version.name to make it a bit more consistent and if you merge after you will also need to add the gradle wrapper:
#11235

ia3andy

LGTM

aloubyansky · 2020-08-06T09:30:42Z

Thanks @mgorniew that's a great contribution. Please create an issue for the duplicated enforcedPlatform.

mgorniew · 2020-08-06T10:56:16Z

@aloubyansky I've created #11251 for dependencies issue.

ia3andy · 2020-08-06T11:43:40Z

@mgorniew you can consider your job done here, excellent work! If that's ok to you, I will merge #11235 first because it needs be backported, I'll take care or updating this PR with the changes :)

mgorniew · 2020-08-11T13:35:56Z

@ia3andy @aloubyansky @gastaldi Please check rebased code. This include fix from #11255, but it is handled in slightly different way. I hope to make this less fragile with #11303, but I would like to have this merged into master first.

devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java

...ools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java

ia3andy · 2020-08-12T06:52:42Z

@gastaldi could you have a look before I merge, it now takes rebase with your fix for bom.

ia3andy

@mgorniew I missed it sorry, but you need to add the Gradle wrappers to the new buildtool codestart, have a look to the Gradle one (don't forget to also add the version data).

It should be a matter of seconds :)

mgorniew · 2020-08-12T08:05:58Z

@ia3andy I've added wrapper.

ia3andy

Good job!

ia3andy · 2020-08-12T10:15:00Z

@mgorniew it seems tests are failing, can you have a look?

ia3andy

Ok I found the problem for JDK 11 tests, you need to use kotlin.version in the templates. For JDK 8, I have no idea..

...in/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts

...ion-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectRunTest.java

ia3andy

Crossing fingers this one is the one :)

ia3andy · 2020-08-13T08:34:29Z

Good job @mgorniew!!

boring-cyborg bot added area/devtools Issues/PR related to maven, gradle, platform and cli tooling/plugins area/gradle Gradle area/maven area/platform Issues related to definition and interaction with Quarkus Platform labels May 15, 2020

aloubyansky reviewed May 15, 2020

View reviewed changes

...est/resources/add-extension-multi-module-kotlin-dsl/gradle/wrapper/gradle-wrapper.properties Outdated Show resolved Hide resolved

mgorniew force-pushed the gradle_kotlin_dsl branch 2 times, most recently from d1da13f to b5c6b5b Compare May 16, 2020 20:38

mgorniew marked this pull request as ready for review May 16, 2020 20:39

mgorniew force-pushed the gradle_kotlin_dsl branch from b5c6b5b to 8cf38b8 Compare May 17, 2020 11:50

aloubyansky self-assigned this Jul 10, 2020

aloubyansky reviewed Jul 10, 2020

View reviewed changes

mgorniew force-pushed the gradle_kotlin_dsl branch from 8cf38b8 to b8d38a7 Compare July 14, 2020 10:33

mgorniew force-pushed the gradle_kotlin_dsl branch from b8d38a7 to 493d066 Compare August 5, 2020 21:25

ia3andy added the area/codestarts label Aug 6, 2020

ia3andy approved these changes Aug 6, 2020

View reviewed changes

ia3andy mentioned this pull request Aug 10, 2020

Improve robustness of our devtools Gradle code #11303

Closed

mgorniew force-pushed the gradle_kotlin_dsl branch from 493d066 to 9726174 Compare August 11, 2020 13:31

ia3andy reviewed Aug 11, 2020

View reviewed changes

devtools/maven/src/main/java/io/quarkus/maven/CreateProjectMojo.java Outdated Show resolved Hide resolved

ia3andy reviewed Aug 11, 2020

View reviewed changes

...ools-common/src/main/java/io/quarkus/devtools/project/buildfile/AbstractGradleBuildFile.java Show resolved Hide resolved

mgorniew force-pushed the gradle_kotlin_dsl branch from 9726174 to 5c260f4 Compare August 11, 2020 21:50

ia3andy requested a review from gastaldi August 12, 2020 06:52

ia3andy requested changes Aug 12, 2020

View reviewed changes

mgorniew force-pushed the gradle_kotlin_dsl branch from 5c260f4 to 8d04d3c Compare August 12, 2020 08:03

mgorniew force-pushed the gradle_kotlin_dsl branch from 8d04d3c to e187e13 Compare August 12, 2020 08:44

ia3andy approved these changes Aug 12, 2020

View reviewed changes

ia3andy requested changes Aug 12, 2020

View reviewed changes

...in/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts Outdated Show resolved Hide resolved

...in/resources/bundled-codestarts/buildtool/gradle-kotlin-dsl/kotlin/build.tpl.qute.gradle.kts Outdated Show resolved Hide resolved

Add support for Gradle Kotlin DSL

e661c7b

mgorniew force-pushed the gradle_kotlin_dsl branch from e187e13 to e661c7b Compare August 12, 2020 12:37

ia3andy reviewed Aug 12, 2020

View reviewed changes

...ion-tests/devtools/src/test/java/io/quarkus/devtools/codestarts/CodestartProjectRunTest.java Show resolved Hide resolved

ia3andy approved these changes Aug 12, 2020

View reviewed changes

ia3andy merged commit f90bea3 into quarkusio:master Aug 13, 2020

geoand added this to the 1.8.0 - master milestone Aug 26, 2020

Add support for Gradle Kotlin DSL #9353

Add support for Gradle Kotlin DSL #9353

Conversation

mgorniew commented May 15, 2020

geoand commented May 15, 2020

aloubyansky commented May 15, 2020

gsmet commented Jul 10, 2020

aloubyansky commented Jul 10, 2020

mgorniew commented Jul 10, 2020 via email

aloubyansky commented Jul 10, 2020

aloubyansky Jul 10, 2020

Choose a reason for hiding this comment

aloubyansky Jul 10, 2020

Choose a reason for hiding this comment

ia3andy commented Jul 10, 2020

gsmet commented Jul 29, 2020

ia3andy commented Jul 29, 2020

aloubyansky commented Jul 29, 2020

ia3andy commented Jul 29, 2020

mgorniew commented Jul 29, 2020

ia3andy commented Jul 29, 2020

mgorniew commented Jul 29, 2020 • edited Loading

ia3andy commented Jul 29, 2020

aloubyansky commented Jul 29, 2020

ia3andy commented Aug 3, 2020

mgorniew commented Aug 3, 2020

mgorniew commented Aug 5, 2020

ia3andy commented Aug 6, 2020 • edited Loading

ia3andy left a comment

Choose a reason for hiding this comment

aloubyansky commented Aug 6, 2020

mgorniew commented Aug 6, 2020 • edited Loading

ia3andy commented Aug 6, 2020

mgorniew commented Aug 11, 2020

ia3andy commented Aug 12, 2020

ia3andy left a comment • edited Loading

Choose a reason for hiding this comment

mgorniew commented Aug 12, 2020

ia3andy left a comment

Choose a reason for hiding this comment

ia3andy commented Aug 12, 2020

ia3andy left a comment

Choose a reason for hiding this comment

ia3andy left a comment

Choose a reason for hiding this comment

ia3andy commented Aug 13, 2020

mgorniew commented Jul 29, 2020 •

edited

Loading

ia3andy commented Aug 6, 2020 •

edited

Loading

mgorniew commented Aug 6, 2020 •

edited

Loading

ia3andy left a comment •

edited

Loading