Various updates and refactors to build platform in general

[touhidurrr]

What this PR contains:

1. Gradle version 8.11.1 -> 9.0.0 (latest stable)
2. remove some redundant dependencies
3. update some actions versions in dockerPublish.yml
4. Dockerfile improvements
5. Kotlin version 2.1.20 -> 2.1.21

[yairm210]

The docker failures seem real
Wet may need to upgrade gradle in the docker image

[touhidurrr]

The docker failures seem real
Wet may need to upgrade gradle in the docker image

It is failing in my local gradle 9.0.0 also. Replacing tasks.create() with tasks.register() might not be so simple. I also wanted to try dependsOn() but the comments seem to be advicing against it.

For now, I will simply revert tasks.create() -> tasks.register() change later, rename this as a minor refactor pr. And maybe learn how tasks work in gradle in more detail and open another pr later.

[SomeTroglodyte]

Minor things: Isn't Enum.values() deprecated by now? And wouldn't the jre/jdk file name be more elegant as enum property than via when?

[touhidurrr]

Minor things: Isn't Enum.values() deprecated by now? And wouldn't the jre/jdk file name be more elegant as enum property than via when?

Check d85257d tests. I used Enum.etries but it failed. It works on my pc though but fails here. I do use some different settings though.

[github-actions]

This pull request has conflicts, please resolve those before we can evaluate the pull request.

[github-actions]

Conflicts have been resolved.

[touhidurrr]

By the way, when did you guys revert Kotlin version.

[SomeTroglodyte]

when did you guys revert Kotlin version.

As far as I can see, it's still 2.1.20, unchanged since #13602

[touhidurrr]

when did you guys revert Kotlin version.

As far as I can see, it's still 2.1.20, unchanged since #13602

I am confused, then what did I change in 6e9a874

[SomeTroglodyte]

then what did I change in 6e9a874

Not the main language level, but specific plugins I'd guess

[touhidurrr]

Minor things: Isn't Enum.values() deprecated by now? And wouldn't the jre/jdk file name be more elegant as enum property than via when?

Ok so I was able to figure out why did it happen. Basically, gradle scripts run on their own kotlin version separate from the projects kotlin version. So, even if the IDE was showing a deprecation warning, it was not correct. I guess the IDE only loads one Kotlin version at a time and that is the projects version.

So, in short the way to make Enum.entries work is to increase the gradle version which in turn will increase the kotlin version that gradle uses. 9.0.0 just happens to use the same kotlin version series (2.1.x) that we currently use so that fixes it.

[touhidurrr]

Gradle updates - More involved, unclear what the implications are

It can be downgraded to latest AGP minimum version 8.13 if you do not like it. It was just me trying to figure out why Enum.entries did not work and testing if 9.0.0 fixes that, which it did. Other than that it fixes nothing.

[touhidurrr]

Docker changes - most of these are basically nothing, unclear why you feel compelled to make these changes

I touched it because some previous builds were only failing in Docker but not anywhere else. Then I realized that nothing there was fixing the issue of hardcoded kotlin version not working in docker. So, I just did some refractors that I saw possible and left it there. A list of such changes would be:

1. Remove unnecessary gradle cannot detect jdk patch. The issue mentioned there was closed long ago and removing those lines did not affect gradle in any way.
2. Use adoptium api to always fetch the latest version of JRE 11 instead of an old hardcoded version. Again harmless but something that I spotted and fixed.
3. Fixed some docker complaints. Such as AS has to be the same case as FROM.
4. Broke && chain into separate RUN calls. It just makes debugging a little easier.
5. Removed openjdk11 installation because it was already being downloaded separately. Only installed openjdk21-jdk to remain consistent with github actions. The version here is only for gradle to run and is not shipped anywhere to my knowledge.

And yes, I did not test if it actually runs. I will try when I go back home and give an update.

[touhidurrr]

ok @yairm210, I tried the latest stable version of Unciv and it simply does not work on windows. It simply runs for eternity without displaying anything. And I cannot build PR so do not know if it works. Maybe only Linux users can verify it to begin with.

[yairm210]

Did you connect via vnc?
https://github.com/yairm210/Unciv?tab=readme-ov-file#run-with-docker-

[touhidurrr]

Did you connect via vnc? https://github.com/yairm210/Unciv?tab=readme-ov-file#run-with-docker-

Ok it worked. But very weird way to play Unciv for sure. I was expecting a window to pop up.

[touhidurrr]

But anyways, building the image locally in Windows is still an impossibility. Thus I am unable to test if it works.

[SeventhM]

But anyways, building the image locally in Windows is still an impossibility

I have no clue if this is a factor and it probably shouldn't be, but I should ask...

What version of Android Studio do you have?

[SeventhM]

Ok, double checking stuff on my end. I'm mostly just lazily doing stuff through Studio, I have no clue the implications for docker, nor am I looking at the fixes or whatever for docker or detekt. Just seeing if I can build it. Side note: I only ask about the Android Studio version because I noticed recently that older versions of Studio could no longer build Unciv (I didn't keep track of the error message, but it failed on Gradle sync itself, saying something was an incorrect version)

Kotlinx-coroutines 1.8.1 -> 1.10.2
Gdx 1.13.1 -> 1.13.5
Kotlin hardcoded values updated to 2.1.21
Gradle 8.11.1 -> 8.14.3 (nothing is asking me to go to 9.0.0, so first attempt not bothering)
Android Gradle plugin 8.9.1 -> 8.12.0

Builds fine, no issues (after disabling purity). Maybe there's a separate problem on your end? It's either that or the Gradle version (which I doubt is the culprit, but you could never be too sure)

Edit: Gradle version 9.0.0 is working fine as well, though it's now suggesting to use Kotlin 2.2.0

[touhidurrr]

Kotlinx-coroutines 1.8.1 -> 1.10.2
Gdx 1.13.1 -> 1.13.5

I did not increment these versions though.

Gradle 8.11.1 -> 8.14.3

And gradle sync will fail in desktop and server build.gradle.kts script without gradle < 9.0.0. To fix these you have to replace Platform.entries with Platfom.values()

[touhidurrr]

Android Gradle plugin 8.9.1 -> 8.12.0

Also, any AGP version >=8.10 will also fail. This is because some additional permission checks are required for these versions. This is why I did not increase AGP version here because it is likely better to this in another PR. patch doesn’t affect anything though.

[touhidurrr]

though it's now suggesting to use Kotlin 2.2.0

Weird. From patch notes I am pretty sure Gradle 9 itself use Kotlin 2.1.x. So I wonder why are they suggesting 2.2. It did not suggest this to me.

Edit: Ok my bad.

Gradle 9 embeds the latest stable release of Kotlin 2.2.x runtime and uses Kotlin language version 2.2.
https://gradle.org/whats-new/gradle-9/#kotlin-and-kotlin-dsl

[touhidurrr]

What version of Android Studio do you have?

Latest feature drop. I updated it a few days ago. Also, this is likely because of how Docker Desktop works and on Windows Home and not for Android Studio. It runs inside WSL. My guess is it cannot access Android Sdk binaries from WSL.

[touhidurrr]

Builds fine, no issues

Can you kindky verify if the docker image build and runs fine with exactly this PR's content? You do not need to disable purity.

[yairm210]

LibGDX we're not upgrading, as per the maintainers' advice, since it have Android problems
Already discussed in another PR somewhere... #13553 ?

[SeventhM]

Can you kindky verify if the docker image build and runs fine with exactly this PR's content? You do not need to disable purity.

Tbh, I have zero clue how to do anything with docker at all

I did not increment these versions though.

I know and that's not my point. My point is that, at least through Studio, things builds fine on my end, so it must be something more docker specific and not just related to upgrading versions. I don't expect us to touch everything I did, I was just seeing what's possible

[touhidurrr]

Tbh, I have zero clue how to do anything with docker at all

Me before opening this PR: Everyone use Docker. I am the only guy who doesn’t. I am so useless.
Me after this PR: What is Docker and why do the maintainers even want me to test if stuff runs on it. Who uses such niche technology that crashes everywhere.

[github-actions]

This pull request has conflicts, please resolve those before we can evaluate the pull request.

[github-actions]

Conflicts have been resolved.

[github-actions]

This pull request has conflicts, please resolve those before we can evaluate the pull request.

[github-actions]

Conflicts have been resolved.

[touhidurrr]

So, after 1919b50 I guess what remains for discussion is if thr Docker image actually runs and what Gradle version can we upgrade to and should we.