build(gradle): upgrade gradle 6.4.2 >>> 8.2.1 #5109

DarkWeird · 2023-07-06T11:30:07Z

Contains

Updating gradle from 6.4.2 -> 8.2.1
Updating gradle's files for which became invalid

How to test

run gradlew jar game -> should build and run game
run gradlew unitTest -> should run the unit test suites

Remarks

Java 20 is not yet supported, see gradle/gradle#23488.

Closes #5111

skaldarnar

With Java 11 compilation and starting the game works fine. 👍

With Java 17 it compiles and I see the expected compilation errors.

With Java 20 (Liberica) compilation fails with

❯ gradlew jar game                                                                                                                                                             (base) 
Processing facade facades:PC, including it as a sub-project
Processing facade facades:TeraEd, including it as a sub-project
> Task :build-logic:generateExternalPluginSpecBuilders UP-TO-DATE
> Task :build-logic:extractPrecompiledScriptPluginPlugins UP-TO-DATE
> Task :build-logic:compilePluginsBlocks UP-TO-DATE
> Task :build-logic:generatePrecompiledScriptPluginAccessors UP-TO-DATE
> Task :build-logic:generateScriptPluginAdapters UP-TO-DATE
> Task :build-logic:compileKotlin FAILED

FAILURE: Build failed with an exception.

* What went wrong:
Execution failed for task ':build-logic:compileKotlin'.
> Error while evaluating property 'compilerOptions.jvmTarget' of task ':build-logic:compileKotlin'.
   > Failed to calculate the value of property 'jvmTarget'.
      > Unknown Kotlin JVM target: 20

* Try:
> Run with --stacktrace option to get the stack trace.
> Run with --info or --debug option to get more log output.
> Run with --scan to get full insights.
> Get more help at https://help.gradle.org.

BUILD FAILED in 531ms
6 actionable tasks: 1 executed, 5 up-to-date

skaldarnar · 2023-07-06T16:47:06Z

engine/build.gradle

-tasks.named("classes") {
-    dependsOn(tasks.named("copyResourcesToClasses"))
-}
-


What happened to this? All the other changes look like simple drop-in replacements, but this is just removed. Do we just not need it anymore?

gradlew unitTest fails with a message seemingly related to this:

FAILURE: Build failed with an exception. * What went wrong: Some problems were found with the configuration of task ':engine-tests:copyResourcesToClasses' (type 'Copy'). - Gradle detected a problem with the following location: '/home/jenkins/agent/workspace/Terasology_engine_PR-5109/engine-tests/build/classes'. Reason: Task ':engine-tests:compileTestJava' uses this output of task ':engine-tests:copyResourcesToClasses' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Possible solutions: 1. Declare task ':engine-tests:copyResourcesToClasses' as an input of ':engine-tests:compileTestJava'. 2. Declare an explicit dependency on ':engine-tests:copyResourcesToClasses' from ':engine-tests:compileTestJava' using Task#dependsOn. 3. Declare an explicit dependency on ':engine-tests:copyResourcesToClasses' from ':engine-tests:compileTestJava' using Task#mustRunAfter. For more information, please refer to https://docs.gradle.org/8.2/userguide/validation_problems.html#implicit_dependency in the Gradle documentation. - Gradle detected a problem with the following location: '/home/jenkins/agent/workspace/Terasology_engine_PR-5109/engine-tests/build/resources/main'. Reason: Task ':engine-tests:copyResourcesToClasses' uses this output of task ':engine-tests:processResources' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Possible solutions: 1. Declare task ':engine-tests:processResources' as an input of ':engine-tests:copyResourcesToClasses'. 2. Declare an explicit dependency on ':engine-tests:processResources' from ':engine-tests:copyResourcesToClasses' using Task#dependsOn. 3. Declare an explicit dependency on ':engine-tests:processResources' from ':engine-tests:copyResourcesToClasses' using Task#mustRunAfter. For more information, please refer to https://docs.gradle.org/8.2/userguide/validation_problems.html#implicit_dependency in the Gradle documentation.

Hm. I just delete it , and game running.
And i see how fix this now.
Seems there we should declare second edge for task graph.

First I tried to add those missing dependencies, but it gets weird quickly, and you also have to add DupliactesStrategys (I suspect because we wildly copy files around and don't care about duplicates or anything). I've added more and more dependsOn and duplicatesStrategy = 'exclude', but in the end still failed to run the tests 😔

My second attempt was to remove the copyResourcesToClasses task and pointers to it completely, from both :engine and :engine-tests. Eventually, the engine (tests) seemingly built, but then errors popped up when dealing with modules:

* What went wrong: Some problems were found with the configuration of task ':modules:CoreWorlds:compileTestJava' (type 'JavaCompile'). - Gradle detected a problem with the following location: '/home/skaldarnar/Code/movingblocks/ts-iota/modules/BiomesAPI/build/classes'. Reason: Task ':modules:CoreWorlds:compileTestJava' uses this output of task ':modules:BiomesAPI:syncModuleInfo' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Possible solutions: 1. Declare task ':modules:BiomesAPI:syncModuleInfo' as an input of ':modules:CoreWorlds:compileTestJava'. 2. Declare an explicit dependency on ':modules:BiomesAPI:syncModuleInfo' from ':modules:CoreWorlds:compileTestJava' using Task#dependsOn. 3. Declare an explicit dependency on ':modules:BiomesAPI:syncModuleInfo' from ':modules:CoreWorlds:compileTestJava' using Task#mustRunAfter. For more information, please refer to https://docs.gradle.org/8.2/userguide/validation_problems.html#implicit_dependency in the Gradle documentation. - Gradle detected a problem with the following location: '/home/skaldarnar/Code/movingblocks/ts-iota/modules/BiomesAPI/build/classes'. Reason: Task ':modules:CoreWorlds:compileTestJava' uses this output of task ':modules:BiomesAPI:syncAssets' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Possible solutions: 1. Declare task ':modules:BiomesAPI:syncAssets' as an input of ':modules:CoreWorlds:compileTestJava'. 2. Declare an explicit dependency on ':modules:BiomesAPI:syncAssets' from ':modules:CoreWorlds:compileTestJava' using Task#dependsOn. 3. Declare an explicit dependency on ':modules:BiomesAPI:syncAssets' from ':modules:CoreWorlds:compileTestJava' using Task#mustRunAfter. For more information, please refer to https://docs.gradle.org/8.2/userguide/validation_problems.html#implicit_dependency in the Gradle documentation. - Gradle detected a problem with the following location: '/home/skaldarnar/Code/movingblocks/ts-iota/modules/BiomesAPI/build/classes'. Reason: Task ':modules:CoreWorlds:compileTestJava' uses this output of task ':modules:BiomesAPI:syncDeltas' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Possible solutions: 1. Declare task ':modules:BiomesAPI:syncDeltas' as an input of ':modules:CoreWorlds:compileTestJava'. 2. Declare an explicit dependency on ':modules:BiomesAPI:syncDeltas' from ':modules:CoreWorlds:compileTestJava' using Task#dependsOn. 3. Declare an explicit dependency on ':modules:BiomesAPI:syncDeltas' from ':modules:CoreWorlds:compileTestJava' using Task#mustRunAfter. For more information, please refer to https://docs.gradle.org/8.2/userguide/validation_problems.html#implicit_dependency in the Gradle documentation. - Gradle detected a problem with the following location: '/home/skaldarnar/Code/movingblocks/ts-iota/modules/BiomesAPI/build/classes'. Reason: Task ':modules:CoreWorlds:compileTestJava' uses this output of task ':modules:BiomesAPI:syncOverrides' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Possible solutions: 1. Declare task ':modules:BiomesAPI:syncOverrides' as an input of ':modules:CoreWorlds:compileTestJava'. 2. Declare an explicit dependency on ':modules:BiomesAPI:syncOverrides' from ':modules:CoreWorlds:compileTestJava' using Task#dependsOn. 3. Declare an explicit dependency on ':modules:BiomesAPI:syncOverrides' from ':modules:CoreWorlds:compileTestJava' using Task#mustRunAfter. For more information, please refer to https://docs.gradle.org/8.2/userguide/validation_problems.html#implicit_dependency in the Gradle documentation. - Gradle detected a problem with the following location: '/home/skaldarnar/Code/movingblocks/ts-iota/modules/CoreAssets/build/classes'. Reason: Task ':modules:CoreWorlds:compileTestJava' uses this output of task ':modules:CoreAssets:syncModuleInfo' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed. Possible solutions: 1. Declare task ':modules:CoreAssets:syncModuleInfo' as an input of ':modules:CoreWorlds:compileTestJava'. 2. Declare an explicit dependency on ':modules:CoreAssets:syncModuleInfo' from ':modules:CoreWorlds:compileTestJava' using Task#dependsOn. 3. Declare an explicit dependency on ':modules:CoreAssets:syncModuleInfo' from ':modules:CoreWorlds:compileTestJava' using Task#mustRunAfter. For more information, please refer to https://docs.gradle.org/8.2/userguide/validation_problems.html#implicit_dependency in the Gradle documentation.

Do we have to re-model all these dependencies to make Gradle happy? Is the new Gradle version just pointing us to places where the setup was "shaky" in the first place?

@BenjaminAmos @DarkWeird do you know what exactly is meant by

//TODO: Remove it when gestalt will can to handle ProtectionDomain without classes (Resources)

@BenjaminAmos @DarkWeird do you know what exactly is meant by

//TODO: Remove it when gestalt will can to handle ProtectionDomain without classes (Resources)

Gestalt works with one source of module.(one jar, one dir etc)
Gradle split resouces and classes(compiled classes) dirs when build sources.
More gradle creates separate classes dir on every sources (java/kotlin/groovy - etc)

…ses`. unitTests and integrationTests works now

jdrueckert · 2023-07-09T20:21:51Z

green checkmarks, yey! 🥳

jdrueckert · 2023-07-09T20:44:00Z

subsystems/DiscordRPC/build.gradle.kts

+configure<SourceSetContainer> {
+    // Adjust output path (changed with the Gradle 6 upgrade, this puts it back)
+    main { java.destinationDirectory.set(File("$buildDir/classes")) }
+    test { java.destinationDirectory.set(File("$buildDir/testClasses")) }
+}


why do we need this now? how was it done before?

Gradle was less strict before, I think. The issue was that both the tests compilation and the main compilation were outputting to the build/classes directory and Gradle did not like that. This fixed the implicit dependency errors. I'm open to a better solution though, this was more of a quick-fix.

This snippet was originally from here:

Terasology/engine-tests/build.gradle

Lines 46 to 50 in 324376a

sourceSets {

// Adjust output path (changed with the Gradle 6 upgrade, this puts it back)

main.java.outputDir = new File("$buildDir/classes")

test.java.outputDir = new File("$buildDir/testClasses")

}

.

I would argue it's reasonable to separate main compilation classes and test compilation classes, so I don't see a need to look for a better solution right now 🤷‍♀️

jdrueckert · 2023-07-09T20:44:06Z

subsystems/TypeHandlerLibrary/build.gradle.kts

+configure<SourceSetContainer> {
+    // Adjust output path (changed with the Gradle 6 upgrade, this puts it back)
+    main { java.destinationDirectory.set(File("$buildDir/classes")) }
+    test { java.destinationDirectory.set(File("$buildDir/testClasses")) }
+}
+


same question here

soloturn · 2023-07-10T04:30:35Z

added a couple of lines in #5113 , which segvaults now with java-20, openjdk, on arch linux:

---------------  S U M M A R Y ------------

Command Line: -XX:MaxDirectMemorySize=512M -XX:+PrintCommandLineFlags -Xmx768M -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant org.terasology.engine.Terasology --homedir=.

Host: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz, 4 cores, 15G, Arch Linux
Time: Mon Jul 10 06:26:14 2023 CEST elapsed time: 4.768798 seconds (0d 0h 0m 4s)

---------------  T H R E A D  ---------------

Current thread (0x00007fe948988640):  JavaThread "splashscreen-loop" daemon [_thread_in_native, id=114136, stack(0x00007fe92c7f8000,0x00007fe92c8f8000)]

Stack: [0x00007fe92c7f8000,0x00007fe92c8f8000],  sp=0x00007fe92c8f6320,  free space=1016k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
C  [iris_dri.so+0xb560c]
Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
j  org.lwjgl.opengl.GL11C.glClear(I)V+0
j  org.lwjgl.opengl.GL11.glClear(I)V+1
j  org.terasology.splash.glfw.graphics.Renderer.clear()V+3
j  org.terasology.engine.GLFWSplashScreen.run()V+457
j  java.lang.Thread.runWith(Ljava/lang/Object;Ljava/lang/Runnable;)V+5 java.base@20.0.1
j  java.lang.Thread.run()V+19 java.base@20.0.1
v  ~StubRoutines::call_stub 0x00007fe937d37cc6

siginfo: si_signo: 11 (SIGSEGV), si_code: 1 (SEGV_MAPERR), si_addr: 0x00007feeb60ba9f0

jdrueckert · 2023-07-12T18:33:13Z

In MovingBlocks/gestalt#136 there's additional changes to the gradle wrapper... we might want to consider adopting those changes here, too. Likely they are automatically generated/updated by gradle - I just don't know how to trigger that thinking Using gradlew after updating the version in gradlew-wrapper.properties didn't...

noticed the gradle wrapper changes in keturn's PRs - we might want those, too

BenjaminAmos · 2023-07-13T18:18:07Z

The gradle upgrade broke the groovyw command, so I've replaced the groovyw wrapper a newer one from 2.1.0 to fix it.

…e-to-8.2 # Conflicts: # facades/TeraEd/build.gradle

soloturn · 2023-07-17T21:27:03Z

#5113 does not crash java-20 jvm any more when as well merging #5107 . java-11 still works. imo these 2 plus #5109 could be merged now.

soloturn · 2023-07-20T02:58:36Z

@DarkWeird you mind merging or cherry-picking 0777f4f , #5113? or you prefer this one to be targetted to develop later?

kotlin-1.9 knows java-20. setting java-11 as target a little more harsh than currently.

soloturn · 2023-07-28T12:42:06Z

found another one, sputbug needs to be pudated: #5126. if you could merge @DarkWeird ?

BenjaminAmos · 2023-07-29T12:54:05Z

Gradle 8.3-rc2 now supports Java 20. I don't believe that we're aiming for Java 20 support yet but it should now be possible to test against it with a slight gradle upgrade.

jdrueckert · 2023-07-31T19:43:49Z

@DarkWeird gradlew output mentions the following:

This version of Gradle expects version '4.0.14' of the `kotlin-dsl` plugin but version '4.1.0' has been applied to project ':build-logic'. Let Gradle control the version of `kotlin-dsl` by removing any explicit `kotlin-dsl` version constraints from your build logic.
WARNING: Unsupported Kotlin plugin version.
The `embedded-kotlin` and `kotlin-dsl` plugins rely on features of Kotlin `1.8.20` that might work differently than in the requested version `1.9.0`.

Guess we might want to fix that as part of this PR?

jdrueckert · 2023-07-31T19:50:44Z

Also, there's a bunch of warnings which I think we don't need to fix in this PR, though.
I created an issue to track them: #5127

DarkWeird added 2 commits July 6, 2023 14:31

build(bumpup-gradle): upgrade gradle and code for it.

e020e81

chore(bumpup-gradle): fix junitXmlReport.isEnabled -> required

ef9695f

DarkWeird force-pushed the build/bumpup-gradle-to-8.2 branch from 5a08176 to ef9695f Compare July 6, 2023 11:47

github-actions bot added the Category: Build/CI Requests, Issues and Changes targeting gradle, groovy, Jenkins, etc. label Jul 6, 2023

jdrueckert added this to the 2023 Revive - Milestone 1 milestone Jul 6, 2023

skaldarnar reviewed Jul 6, 2023

View reviewed changes

skaldarnar mentioned this pull request Jul 6, 2023

Java 18 - do not set SecurityManager if unsupported #5107

Merged

skaldarnar changed the title ~~build(bumpup-gradle): upgrade gradle and code for it.~~ build(gradle): upgrade gradle 6.4.2 >>> 8.2 Jul 6, 2023

build(bumpup-gradle): fix several declaration of `copyResourcesToClas…

74962ea

…ses`. unitTests and integrationTests works now

skaldarnar mentioned this pull request Jul 8, 2023

outputdir --> destinationDirectory, prepare gradle upgrade #5111

Closed

BenjaminAmos added 2 commits July 9, 2023 16:53

build: fix undeclared implicit dependency gradle errors

bc7aede

build: fix more undeclared dependency gradle errors

7ce779a

Merge branch 'develop' into build/bumpup-gradle-to-8.2

8febb2a

jdrueckert previously approved these changes Jul 9, 2023

View reviewed changes

jdrueckert mentioned this pull request Jul 12, 2023

build: upgrade gradle 6.5 -> 8.2.1 MovingBlocks/JNBullet#14

Merged

jdrueckert self-requested a review July 12, 2023 18:39

jdrueckert mentioned this pull request Jul 12, 2023

build: bump gradle 6.8.2 -> 8.2.1 MovingBlocks/JNLua#12

Merged

jdrueckert assigned DarkWeird and BenjaminAmos Jul 13, 2023

build: update groovyw wrapper to work with Gradle 8

a01b4b2

Merge remote-tracking branch 'origin/develop' into build/bumpup-gradl…

8e8db17

…e-to-8.2 # Conflicts: # facades/TeraEd/build.gradle

soloturn mentioned this pull request Jul 17, 2023

use kotlin-1.9, force java-11 target. #5113

Merged

Merge branch 'develop' into build/bumpup-gradle-to-8.2

8e80f70

soloturn and others added 2 commits July 20, 2023 12:17

use kotlin-1.9, force java-11 target. (#5113)

f8571e5

kotlin-1.9 knows java-20. setting java-11 as target a little more harsh than currently.

Merge branch 'develop' into build/bumpup-gradle-to-8.2

9ae368c

build: bump gradle 8.2 -> 8.2.1

2af7e23

jdrueckert changed the title ~~build(gradle): upgrade gradle 6.4.2 >>> 8.2~~ build(gradle): upgrade gradle 6.4.2 >>> 8.2.1 Jul 30, 2023

jdrueckert mentioned this pull request Jul 30, 2023

build: bump gradle 8.2 -> 8.2.1 MovingBlocks/SplashScreen#10

Merged

jdrueckert added 2 commits July 31, 2023 20:14

Merge branch 'develop' into build/bumpup-gradle-to-8.2

9599829

chore: update gradle wrapper

bdc7535

jdrueckert mentioned this pull request Jul 31, 2023

Refactor build logic to remove deprecations #5127

Closed

6 tasks

Merge branch 'develop' into build/bumpup-gradle-to-8.2

65f0078

PurityLake mentioned this pull request Aug 21, 2023

refactor: fix gradle warnings #5130

Closed

ci: update spotbugs version for gradle 7+, java-17, java-20 (#5126)

1be7417

skaldarnar approved these changes Sep 3, 2023

View reviewed changes

Merge branch 'develop' into build/bumpup-gradle-to-8.2

e5a8e6d

jdrueckert merged commit 43a7e05 into develop Sep 3, 2023
9 checks passed

jdrueckert deleted the build/bumpup-gradle-to-8.2 branch September 3, 2023 21:02

PurityLake mentioned this pull request Sep 24, 2023

refactor: fix gradle warnings #5140

Closed

Cervator mentioned this pull request Sep 25, 2023

Fix minor Gradle 8 upgrade issue Terasology/Index#19

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build(gradle): upgrade gradle 6.4.2 >>> 8.2.1 #5109

build(gradle): upgrade gradle 6.4.2 >>> 8.2.1 #5109

DarkWeird commented Jul 6, 2023 •

edited by jdrueckert

Loading

skaldarnar left a comment •

edited

Loading

skaldarnar Jul 6, 2023

skaldarnar Jul 6, 2023

DarkWeird Jul 6, 2023

skaldarnar Jul 8, 2023

skaldarnar Jul 8, 2023

skaldarnar Jul 8, 2023

DarkWeird Jul 8, 2023

jdrueckert commented Jul 9, 2023

jdrueckert Jul 9, 2023

BenjaminAmos Jul 9, 2023

BenjaminAmos Jul 9, 2023

jdrueckert Jul 9, 2023

jdrueckert Jul 9, 2023

soloturn commented Jul 10, 2023 •

edited

Loading

jdrueckert commented Jul 12, 2023

BenjaminAmos commented Jul 13, 2023

soloturn commented Jul 17, 2023

soloturn commented Jul 20, 2023 •

edited

Loading

soloturn commented Jul 28, 2023 •

edited

Loading

BenjaminAmos commented Jul 29, 2023

jdrueckert commented Jul 31, 2023 •

edited

Loading

jdrueckert commented Jul 31, 2023

	sourceSets {
	// Adjust output path (changed with the Gradle 6 upgrade, this puts it back)
	main.java.outputDir = new File("$buildDir/classes")
	test.java.outputDir = new File("$buildDir/testClasses")
	}

build(gradle): upgrade gradle 6.4.2 >>> 8.2.1 #5109

build(gradle): upgrade gradle 6.4.2 >>> 8.2.1 #5109

Conversation

DarkWeird commented Jul 6, 2023 • edited by jdrueckert Loading

Contains

How to test

Remarks

skaldarnar left a comment • edited Loading

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

jdrueckert commented Jul 9, 2023

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

soloturn commented Jul 10, 2023 • edited Loading

jdrueckert commented Jul 12, 2023

BenjaminAmos commented Jul 13, 2023

soloturn commented Jul 17, 2023

soloturn commented Jul 20, 2023 • edited Loading

soloturn commented Jul 28, 2023 • edited Loading

BenjaminAmos commented Jul 29, 2023

jdrueckert commented Jul 31, 2023 • edited Loading

jdrueckert commented Jul 31, 2023

DarkWeird commented Jul 6, 2023 •

edited by jdrueckert

Loading

skaldarnar left a comment •

edited

Loading

soloturn commented Jul 10, 2023 •

edited

Loading

soloturn commented Jul 20, 2023 •

edited

Loading

soloturn commented Jul 28, 2023 •

edited

Loading

jdrueckert commented Jul 31, 2023 •

edited

Loading