Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump JDK 17 and using toolchain #1392

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

Bump JDK 17 and using toolchain #1392

wants to merge 14 commits into from
+11 −46

Conversation

Jaehwa-Noh
Copy link
Contributor

@Jaehwa-Noh Jaehwa-Noh commented Apr 23, 2024 •
edited
Loading

What I have done and why
• Replace sourceCompatibility and targetCompatibility to toolchain
• Add toolchain resolver org.gradle.toolchains.foojay-resolver-convention
• Bump JDK11 to JDK17

JDK 17

In this issuetracker shows, no need to fix the version of JDK at 11 to use desugaring.
https://issuetracker.google.com/issues/343505126

toolchain

According this documentation

We recommend that you always specify the Java toolchain, and either ensure that the specified JDK is installed, or add a toolchain resolver to your build.

If not specified, this defaults to the Java toolchain or JDK used to run Gradle. We recommend that you always explicitly specify a toolchain (preferred) or sourceCompatibility.

resolver

documentation

If you use Gradle 8.0.2 or higher, you also need to add a toolchain resolver plugin. This type of plugin manages which repositories to download a toolchain from. As an example, add to your settings.gradle(.kts) the following plugin:

Fix #1483

How I'm testing it

Choose at least one:

  • Unit tests
  • UI tests
  • Screenshot tests
  • N/A (provide justification)

@Jaehwa-Noh
Change to toolchain and remove KotlinCompile.
199110e 
Change-Id: I86d606a582e3cdf5b7d2c9304783a905682920ad
@Jaehwa-Noh
Add plugins
f46635f 
- "org.gradle.toolchains.foojay-resolver-convention".

Change-Id: I8368ffa068c1b6318160fc4783f851595cd667ff
@Jaehwa-Noh
Move lines.
e3fb617 
Change-Id: I0d706d410ca339789c0fea60b451aa82920648de
@Jaehwa-Noh
Remove JavaVersion 11
f4dfdf1 
Change-Id: Ibdf89dd4f82a01fd8b765adb94668a615970c291
@Jaehwa-Noh
Rename to configureToolChain, and set toolchain 11
1eedad1 
Change-Id: I878ab5315b861319d61498670124f0de5d4a5c49
@Jaehwa-Noh
Change java to kotlin extension.
2f4b76a 
Change-Id: Ic32957cfcbfbf80bf82358fd4811be8d17bb3a94
@Jaehwa-Noh Jaehwa-Noh marked this pull request as draft April 23, 2024 08:04
@Jaehwa-Noh Jaehwa-Noh marked this pull request as ready for review April 23, 2024 10:56
@Jaehwa-Noh
Merge branch 'android-remote-main' into gradle-toolchain
ffb9b1c 
Change-Id: I85ac5d0d6ab81a618ab90dd41bdd40bfb7db7fc3

# Conflicts:
#	build-logic/convention/build.gradle.kts
#	build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
#	lint/build.gradle.kts
@Jaehwa-Noh Jaehwa-Noh marked this pull request as draft May 30, 2024 07:22
Jaehwa-Noh added 6 commits May 30, 2024 16:32
@Jaehwa-Noh
Call configureKotlin directly.
7ab4d37 
Change-Id: I5aef26e99c33124ebe99c5045a7ca89083a2e73d
@Jaehwa-Noh
Remove configureToolChain function.
5fcb66a 
Change-Id: I3e04f3fdf04a2ac98cf83c331e38202920cf1bce
@Jaehwa-Noh
Set toolchain 17.
cde2aa2 
Change-Id: Ibd27ae52e9c6edafc654574e7ddaa8742ad69a24
@Jaehwa-Noh
Remove desugar.
81ae9e3 
Change-Id: I1e1074c6e6fdfc578c82bf6263879ef9e5eb9364
@Jaehwa-Noh
[empty] re-run CI.
79e07f4 
Change-Id: Ieb6d9c63ad2012dde3e7280ccea25dbd80edd8e7
@Jaehwa-Noh
Revert "Remove desugar."
b43e1c6 
This reverts commit 81ae9e3.
@Jaehwa-Noh Jaehwa-Noh changed the title Preferred toolchain use Bump JDK 17 and using toolchain May 30, 2024
@Jaehwa-Noh Jaehwa-Noh mentioned this pull request May 30, 2024
Open
3 tasks
@Jaehwa-Noh Jaehwa-Noh marked this pull request as ready for review May 30, 2024 11:38
@Jaehwa-Noh Jaehwa-Noh mentioned this pull request May 31, 2024
Closed
@yschimke yschimke mentioned this pull request Nov 18, 2024
Open
@keyboardsurfer
Copy link
Member

Thanks for your PR. Currently there are conflicts that need to be resolved before we can move on to possibly accepting your contribution. Please resolve the conflicts.

@Jaehwa-Noh Jaehwa-Noh marked this pull request as draft December 20, 2024 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Desugaring doesn't need to fix at JDK 11 version.
2 participants
@Jaehwa-Noh @keyboardsurfer