chore: bump Gradle to 8.1.1, Kotlin to 1.8.21 #1418

vlsi · 2023-04-27T13:11:00Z

I suggest upgrading Gradle and Koltin compiler versions and migrating to build-logic.
See https://github.com/apache/jmeter/tree/master/build-logic , https://docs.gradle.org/current/userguide/structuring_software_products.html

I confirm that I have read the Contributor Agreements v1.0, agree to be bound on them and confirm that my contribution is compliant.

vlsi · 2023-04-27T19:32:23Z

@robstoll , WDYT?

I want this change so KSP generator can be included better into Atrium source code.

vlsi · 2023-04-27T19:33:23Z

build-logic/jvm/src/main/kotlin/build-logic.jacoco-conventions.gradle.kts

+        }
+    }
+
+    val jacocoAdditionalExtraName = "jacocoAdditional"


This should be replaced with a proper plugin, so it exposes a regular extension instead of relying on project.extra

feel free to improve it 👍

robstoll · 2023-04-28T06:46:12Z

We cannot merge this into main currently because Kotlin 1.6 cannot guarantee language level 1.2

I want to release 1.0.0 with support for Kotlin 1.2
1.1.0 will require at least 1.3 but why not directly jump to 1.4

On top of my head, Kotlin 1.6 should be able to guarantee language level 1.4

So either already create a 1.1.0 branch or wait a bit until I have released 1.0.0

vlsi · 2023-04-28T07:06:30Z

What are the projects that are stuck with language level 1.2 for test projects?

Is it really that important to support that?

robstoll · 2023-04-28T07:14:12Z

we currently have the support and I would like to release 1.0.0 sooner than later. As said, we drop the support with 1.1.0

vlsi · 2023-04-28T07:38:32Z

What is the 1.0.0 release date?
Frankly speaking, I would like to start working on KSP generator.
The KSP generator will be atrium-specific as it would use atrium annotations, and it will generate atirum-specific Expect<..>... extension properties.
That means the generator should be placed in atrium repository rather than something like https://github.com/vlsi/kotlin-argument-expression.

At the same time, the current Gradle project structure is not welcoming to add subprojects of different types, so I would like to migrate to build-logic before adding KSP and Gradle plugins to the repo.

robstoll · 2023-04-28T07:49:17Z

no worries, you can start right away, just create a corresponding branch, we will merge it into main once 1.0.0 is released. (I will release a RC-1 after the relocation PR is merged)

robstoll · 2023-05-29T21:02:21Z

@vlsi 1.0.0 is out, looking forward to a rebased version of this PR 🙂

...-logic-commons/gradle-plugin/src/main/kotlin/build-logic.kotlin-dsl-gradle-plugin.gradle.kts

atrium-core/build.gradle.kts

build-logic/jvm/build.gradle.kts

build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts

build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts

build-logic/jvm/src/main/kotlin/build-logic.test-junit5.gradle.kts

build-logic/publishing/src/main/kotlin/build-logic.publish-to-tmp-maven-repo.gradle.kts

build-logic/root-build/src/main/kotlin/build-logic.root-build.gradle.kts

build-logic/settings.gradle.kts

settings.gradle.kts

robstoll · 2023-06-05T07:42:57Z

@vlsi see other PR regarding update to gradle 8.1 I already fixed a few issues there which you will encounter here as well

vlsi · 2023-06-05T09:07:48Z

The current error comes from check-dexer.gradle, and I don't understand what it is doing. It is doing cross-project configuration again which is, well, hard to reason.

I suggest reworking check-dexer into a build-logic plugin after this PR is merged.

…repository

vlsi · 2023-06-05T10:54:38Z

@robstoll , I think this is good enough.

It fails with the following error that is out of my control:

Build atrium FAILURE reason:                                
    Execution failed for task ':atrium-api-fluent:validateBeforePublish':
        java.lang.IllegalStateException: You need to define property with name gpgPassphrase or System.env variable with name GPG_PASSPHRASE for publishing (empty or blank is considered to be undefined)
            at ch.tutteli.gradle.plugins.publish.ValidationKt.throwIllegalStateException(Validation.kt:23)
            at ch.tutteli.gradle.plugins.publish.ValidateBeforePublishTask.getProjectExtraThrowIfNullOrBlank(ValidateBefo

robstoll · 2023-06-05T11:53:11Z

@vlsi sweet, thanks I'll take care of the rest 👍

robstoll

@vlsi I am currently rebasing these changes (almost done: https://github.com/robstoll/atrium/tree/build-logic) and I have a few questions in addition.

build-logic/build.gradle.kts

build-logic/root-build/build.gradle.kts

robstoll · 2023-06-14T21:43:03Z

build-logic/publishing/src/main/kotlin/build-logic.dokka.gradle.kts

+    id("ch.tutteli.gradle.plugins.dokka")
+}
+
+fun AbstractDokkaTask.configurePlugins() {


same as in /build.gradle.kts is there a way to mitigate duplication?

Well, you suggested using ch.tutteli.gradle.plugins.dokka, and I used it. In that case, I expect you could factor the logic into that plugin.

Of course, you can create build-logic.dokka.gradle.kts and factor Dokka configuration there, however, at this point it is more like your preference, and a lack of my interest in reverse-engineering ch.tutteli.gradle.plugins.dokka

good, I am not familiar with build-logic and thought there might be a reason why it cannot be move to an own convention-plugin. Thanks for the explanation 👍

robstoll · 2023-06-14T21:45:54Z

build-logic/publishing/src/main/kotlin/build-logic.published-java-platform.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+    id("java-platform")


do you know if this plugin is the cause that running ./gradlew build includes creating the javadoc?

I do not think so. java-platform should be something that configures the project to serve as pom.xml (== type=pom, dependency-only project which can be used as a set of version constraints).

What do you mean by "creating javadocs"?

I recently migrated some of Apache JMeter javadocs to Dokka-generated javadocs, and here's the pattern I arrived to: https://github.com/apache/jmeter/blob/88423edfb1a354a6170ca608d3fb074bb5b7f2ff/build-logic/jvm/src/main/kotlin/build-logic.dokka-javadoc.gradle.kts#L30-L47

It might help if you want "remove javadoc-generated javadocs" (see altering default javadoc classifier and removing it from JAVADOC_ELEMENTS_CONFIGURATION_NAME configuration artifacts).

suddenly the build task depends on the javadoc task. I'll figure out why

robstoll · 2023-06-18T21:01:26Z

build-logic/jvm/src/main/kotlin/build-logic.java.gradle.kts

+    id("java")
+    id("ch.tutteli.gradle.plugins.junitjacoco")
+    id("com.github.vlsi.crlf")
+    id("com.github.vlsi.gradle-extensions")


@vlsi I like the improved error reporting in case a gradle build fails due to some misconfiguration or whatever. Yet, it is too verbose regarding tests for my taste. Is there a way to disable the report for the individual tests? This basically clutters the output too much, having ~4500 tests for atrium-api-fluent alone. The summary would be enough (in this case I could disable the one of tutteli-plugin as yours looks nicer 🙂)

How about the following?

# com.github.vlsi.gradle-extensions prints only failing or slow test results slowTestLogThreshold=1000 slowSuiteLogThreshold=2000

I don't think the problem are slow tests, most prints mention 0.0sec
maybe the problem is that it prints a summary per suite as well?

The properties above are the thresholds, so if you increase them, it won't print tests that fit into the thresholds. The defaults are 0, 0 which might not be a best selection for projects that have many tests.

I think I would increase the default thresholds from 0, 0 to something less verbose.
The key idea there was to catch cases when a single test takes significant time.

Here's sample output in jqwik:

Output: https://github.com/jqwik-team/jqwik/actions/runs/5302500735/jobs/9597464437#step:5:407

Configuration: https://github.com/jqwik-team/jqwik/blob/e2e3e0c450a46d87cdd59047c5d97ced15e73b4b/gradle.properties#L1-L3

Ah ok, I was so sure that the default threshold would be above 0 that I did not even try it out. Sorry about that, going to adjust it then. I see the idea behind the threshold and IMO it makes sense to have something like that

vlsi requested a review from robstoll as a code owner April 27, 2023 13:11

vlsi force-pushed the gradle8 branch from a8a020b to b246635 Compare April 27, 2023 19:30

vlsi commented Apr 27, 2023

View reviewed changes

robstoll reviewed May 29, 2023

View reviewed changes

chore: bump Gradle to 8.1.1, kotlin to 1.6.21

e57edea

vlsi force-pushed the gradle8 branch from 161bc65 to 085acc8 Compare June 5, 2023 07:24

vlsi changed the title ~~chore: bump Gradle to 8.1.1, Kotlin to 1.6.21~~ chore: bump Gradle to 8.1.1, Kotlin to 1.8.21 Jun 5, 2023

vlsi force-pushed the gradle8 branch from 085acc8 to 8f37ddc Compare June 5, 2023 07:26

chore: migrate build to build-logic

2cc85e8

vlsi force-pushed the gradle8 branch from 8f37ddc to 2cc85e8 Compare June 5, 2023 08:01

vlsi added 6 commits June 5, 2023 12:12

comment out check-dexer.gradle call

98936f2

Revert FAIL_ON_PROJECT_REPOS as kotlinNodeJsSetup still configures a …

db759de

…repository

Make sure kotlin source sets depend on the generator tasks

8827a12

Ensure JavaCompile.targetCompatibility is set for Kotlin projects

dc1656e

Fix dependencies for kotlin code generators

90f1a98

Fix deprecated APIs in bc-tests

ac18f74

main -> mainClass in bc-tests

94c584c

robstoll changed the base branch from main to gradle8 June 6, 2023 19:24

robstoll merged commit 723e1e8 into robstoll:gradle8 Jun 6, 2023

robstoll reviewed Jun 14, 2023

View reviewed changes

robstoll reviewed Jun 18, 2023

View reviewed changes

robstoll mentioned this pull request Jun 20, 2023

rewrite build to build-logic #1465

Merged

Uh oh!

chore: bump Gradle to 8.1.1, Kotlin to 1.8.21 #1418

chore: bump Gradle to 8.1.1, Kotlin to 1.8.21 #1418

Uh oh!

Conversation

vlsi commented Apr 27, 2023

Uh oh!

vlsi commented Apr 27, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

robstoll commented Apr 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vlsi commented Apr 28, 2023

Uh oh!

robstoll commented Apr 28, 2023

Uh oh!

vlsi commented Apr 28, 2023

Uh oh!

robstoll commented Apr 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

robstoll commented May 29, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

robstoll commented Jun 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vlsi commented Jun 5, 2023

Uh oh!

vlsi commented Jun 5, 2023

Uh oh!

robstoll commented Jun 5, 2023

Uh oh!

robstoll left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

robstoll commented Apr 28, 2023 •

edited

Loading

robstoll commented Apr 28, 2023 •

edited

Loading

robstoll commented Jun 5, 2023 •

edited

Loading

robstoll left a comment •

edited

Loading