Kotlin DSL assignment plugin integration #22240

asodja · 2022-09-29T09:37:36Z

This adds the Kotlin assignment plugin to the Gradle.

Part of #9268.

TODO:

Publish kotlin-dsl Gradle plugin with support for the Kotlin compiler assignment plugin: done as part of Update kotlin-dsl plugin version #23529

subprojects/base-services/src/main/java/org/gradle/api/SupportsKotlinAssignment.java

...in-dsl-plugins/src/main/kotlin/org/gradle/kotlin/dsl/plugins/dsl/KotlinDslCompilerPlugins.kt

subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/KotlinBuildScript.kt

subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/KotlinInitScript.kt

subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/KotlinSettingsScript.kt

...in-dsl-plugins/src/main/kotlin/org/gradle/kotlin/dsl/plugins/dsl/KotlinDslCompilerPlugins.kt

subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/KotlinAssignmentExtensions.kt

lptr · 2023-01-09T14:12:20Z

subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/KotlinSettingsScript.kt

@@ -73,7 +74,8 @@ import kotlin.script.templates.ScriptTemplateDefinition
        "-Xjsr305=strict",
        "-XXLanguage:+DisableCompatibilityModeForNewInference",
        "-XXLanguage:-TypeEnhancementImprovementsInStrictMode",
-    ]
+    ],
+    provider = KotlinBuildScriptTemplateAdditionalCompilerArgumentsProvider::class


❔ I guess there's no way to extract these annotations to a super-class, right?

Forgot to answer this one: I tried it, but it seems it doesn't work with a super-class.

.../kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/assignment/internal/KotlinDslAssignment.kt

...sl/src/main/kotlin/org/gradle/kotlin/dsl/precompile/PrecompiledScriptDependenciesResolver.kt

lptr · 2023-01-09T14:22:50Z

subprojects/kotlin-dsl/src/main/kotlin/org/gradle/kotlin/dsl/provider/KotlinScriptEvaluator.kt

@@ -376,7 +379,7 @@ class CompileKotlinScript(
        identityFileInputs: MutableMap<String, CurrentFileCollectionFingerprint>
    ): UnitOfWork.Identity {
        val identityHash = newHasher().let { hasher ->
-            listOf("templateId", "sourceHash", "compilationClassPath", "accessorsClassPath").forEach {
+            listOf("assignmentOverloadEnabled", "templateId", "sourceHash", "compilationClassPath", "accessorsClassPath").forEach {


🤔 Would be nice to move these strings out into constants to avoid typos.

Moved to constants. Also I see identity hash doesn't contain jvmTarget, I guess we should add it? /cc @eskatos

It might be we missed to add it to the identity hash

Maybe it would be worth extracting this listOf() as a constant close to the declaration of the other constants to avoid missing another property later?

Moved the list to constants

lptr · 2023-01-09T14:25:19Z

...g/gradle/kotlin/dsl/template/KotlinBuildScriptTemplateAdditionalCompilerArgumentsProvider.kt

+ * limitations under the License.
+ */
+
+@file:Suppress("DEPRECATION")


❓ Why is this necessary? If we need it, let's document why (and for how long).

We implemented deprecated ScriptTemplateAdditionalCompilerArgumentsProvider since there is no good replacement yet. Added a comment.

Thanks.

🧐 This should not be a Javadoc comment, but instead //.

...src/integTest/kotlin/org/gradle/kotlin/dsl/integration/KotlinDslAssignmentIntegrationTest.kt

...in-dsl-plugins/src/integTest/kotlin/org/gradle/kotlin/dsl/plugins/dsl/KotlinDslPluginTest.kt

lptr

LGTM, left one small comment, decide if it's worth addressing.

eskatos

We should emit a message saying that Kotlin DSL property assignment is an incubating feature.

About adding more assignment extensions, did you look at what Groovy does for ConfigurableFileCollection and ListProperty & co?

eskatos · 2023-01-12T14:07:21Z

...in-dsl-plugins/src/main/kotlin/org/gradle/kotlin/dsl/plugins/dsl/KotlinDslCompilerPlugins.kt

+                        // Kotlin 1.8.0 has wrong warning message for assign plugin,
+                        // replace with 'Assign Kotlin compiler plugin is an experimental feature' once we update to 1.8.20.
+                        // https://github.com/JetBrains/kotlin/commit/0eb34983cb38064684cfc76dacb8d4460fcc6573
+                        "Lombok Kotlin compiler plugin is an experimental feature",


❔ We could consider adding both messages already.
When 1.8.20 will be out, early adopters will use it before we get a chance to upgrade.

I planned to add other extension methods in follow-up PR, but I can do that now.

More assignment extensions could go into another PR, me thinks. It was just me being curious and wanting to make sure we don't forget.

+1 to keeping this small and instead creating issues to make sure we don't forget adding more stuff.

@lptr are you referring to my original comment in this thread about the compiler warning or to the other extension methods subject?

I meant the extension methods.

Added additional message, also I added incubating message. Message is triggered from assign methods.

…ubating log message

asodja · 2023-01-12T17:10:36Z

@bot-gradle test this

bot-gradle · 2023-01-12T17:10:46Z

I've triggered the following builds for you:

PullRequestFeedback build

asodja · 2023-01-13T08:23:21Z

@bot-gradle test and merge

bot-gradle · 2023-01-13T08:23:33Z

I've triggered a build for you.

eskatos · 2023-01-13T10:19:46Z

🎉

So we can dogfood #22240. Co-authored-by: Anže Sodja <asodja@gradle.com>

asodja changed the title ~~Spike for Kotlin assignment plugin integration~~ Spike Kotlin assignment plugin integration Sep 29, 2022

asodja self-assigned this Sep 29, 2022

asodja added the @execution label Sep 29, 2022

asodja force-pushed the asodja/use-kotlin-assign-plugin branch from cb085ca to e8c8512 Compare September 29, 2022 09:41

lptr reviewed Sep 29, 2022

View reviewed changes

asodja force-pushed the asodja/use-kotlin-assign-plugin branch 6 times, most recently from 746b359 to 47617ac Compare October 17, 2022 14:55

asodja force-pushed the asodja/use-kotlin-assign-plugin branch 2 times, most recently from 58329b3 to d31f817 Compare October 19, 2022 14:53

asodja force-pushed the asodja/use-kotlin-assign-plugin branch 2 times, most recently from 00eac71 to 7344c4a Compare November 15, 2022 16:32

gradle deleted a comment from asodja Nov 15, 2022

gradle deleted a comment from bot-gradle Nov 15, 2022

eskatos reviewed Nov 16, 2022

View reviewed changes

gradle deleted a comment from asodja Nov 29, 2022

asodja force-pushed the asodja/use-kotlin-assign-plugin branch from 87ca3ad to 3348b46 Compare November 29, 2022 18:07

gradle deleted a comment from bot-gradle Nov 29, 2022

asodja force-pushed the asodja/use-kotlin-assign-plugin branch 2 times, most recently from 2c01741 to 46acdf5 Compare December 23, 2022 10:11

asodja changed the title ~~Spike Kotlin assignment plugin integration~~ Kotlin DSL assignment plugin integration Dec 23, 2022

gradle deleted a comment from asodja Dec 23, 2022

gradle deleted a comment from bot-gradle Dec 23, 2022

asodja added this to the 8.1 RC1 milestone Dec 23, 2022

Register Kotlin compiler plugin

1237828

asodja requested a review from lptr January 9, 2023 13:49

lptr reviewed Jan 9, 2023

View reviewed changes

asodja added 2 commits January 11, 2023 15:22

Inc. review comments for Kotlin DSL assignment

0e00c8c

Pass ProgramId to UnitOfWork for Kotlin scripts

16de9c6

asodja force-pushed the asodja/use-kotlin-assign-plugin branch from 799f878 to 16de9c6 Compare January 11, 2023 16:30

gradle deleted a comment from asodja Jan 11, 2023

lptr mentioned this pull request Jan 12, 2023

Dogfood Kotlin DSL assignment overload #23502

Closed

lptr approved these changes Jan 12, 2023

View reviewed changes

asodja added 2 commits January 12, 2023 14:29

Small review fixes for Kotlin DSL assignment

6b11e4c

Merge branch 'master' into asodja/use-kotlin-assign-plugin

5ac6ce1

gradle deleted a comment from asodja Jan 12, 2023

eskatos reviewed Jan 12, 2023

View reviewed changes

gradle deleted a comment from asodja Jan 12, 2023

Add additional assign line to Kotlin warning rewritter, also emit inc…

be36048

…ubating log message

asodja force-pushed the asodja/use-kotlin-assign-plugin branch from 172f1af to be36048 Compare January 12, 2023 16:52

Make ktlint check happy

88d3fcc

gradle deleted a comment from asodja Jan 12, 2023

gradle deleted a comment from asodja Jan 13, 2023

bot-gradle merged commit 929af47 into master Jan 13, 2023

bot-gradle deleted the asodja/use-kotlin-assign-plugin branch January 13, 2023 09:37

asodja mentioned this pull request Jan 13, 2023

Update kotlin-dsl plugin version #23529

Merged

bot-gradle added a commit that referenced this pull request Jan 13, 2023

Merge pull request #23529 Update kotlin-dsl plugin version

d8d68f0

So we can dogfood #22240. Co-authored-by: Anže Sodja <asodja@gradle.com>

asodja mentioned this pull request Jan 19, 2023

Concise and statically-typed Property<T> assignment #9268

Closed

TWiStErRob mentioned this pull request Jan 31, 2023

Fix deprecation warnings in build GoogleCloudPlatform/app-gradle-plugin#448

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Kotlin DSL assignment plugin integration #22240

Kotlin DSL assignment plugin integration #22240

asodja commented Sep 29, 2022 •

edited

lptr Jan 9, 2023

asodja Jan 12, 2023

lptr Jan 9, 2023

asodja Jan 11, 2023

eskatos Jan 12, 2023

lptr Jan 12, 2023

asodja Jan 12, 2023

lptr Jan 9, 2023

asodja Jan 11, 2023

lptr Jan 12, 2023

asodja Jan 12, 2023

lptr left a comment

eskatos left a comment

eskatos Jan 12, 2023 •

edited

asodja Jan 12, 2023 •

edited

eskatos Jan 12, 2023

lptr Jan 12, 2023

eskatos Jan 12, 2023

lptr Jan 12, 2023

asodja Jan 12, 2023

asodja commented Jan 12, 2023

bot-gradle commented Jan 12, 2023

asodja commented Jan 13, 2023

bot-gradle commented Jan 13, 2023

eskatos commented Jan 13, 2023

Kotlin DSL assignment plugin integration #22240

Kotlin DSL assignment plugin integration #22240

Conversation

asodja commented Sep 29, 2022 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lptr left a comment

Choose a reason for hiding this comment

eskatos left a comment

Choose a reason for hiding this comment

eskatos Jan 12, 2023 • edited

Choose a reason for hiding this comment

asodja Jan 12, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

asodja commented Jan 12, 2023

bot-gradle commented Jan 12, 2023

asodja commented Jan 13, 2023

bot-gradle commented Jan 13, 2023

eskatos commented Jan 13, 2023

asodja commented Sep 29, 2022 •

edited

eskatos Jan 12, 2023 •

edited

asodja Jan 12, 2023 •

edited