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

Proof of concept decouple Gradle JDK from compiling JDK #234

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Proof of concept decouple Gradle JDK from compiling JDK #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb59c48
Proof of concept decouple Gradle JDK from compiling JDK
TWiStErRob Sep 29, 2024
b3d1d11
gradlew apiDump
TWiStErRob Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 22
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the advantage of changing this version?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It'll actually slow down builds because you'll install 17 only to then have to install 22.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, totally correct. I changed it only to prove that the setup is now independent of what JDK is running the Gradle process.

java-version: 17
- uses: gradle/actions/setup-gradle@v3
- name: Run tests
run: >-
Expand Down
1 change: 1 addition & 0 deletions mordant-jvm-ffm/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ plugins {

kotlin {
jvm()
jvmToolchain(22)
sourceSets {
commonMain.dependencies {
implementation(project(":mordant"))
Expand Down
8 changes: 0 additions & 8 deletions mordant/api/mordant.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,6 @@ public final class com/github/ajalt/mordant/rendering/Line : java/util/List, kot
public synthetic fun add (Ljava/lang/Object;)Z
public fun addAll (ILjava/util/Collection;)Z
public fun addAll (Ljava/util/Collection;)Z
public fun addFirst (Lcom/github/ajalt/mordant/rendering/Span;)V
public synthetic fun addFirst (Ljava/lang/Object;)V
public fun addLast (Lcom/github/ajalt/mordant/rendering/Span;)V
public synthetic fun addLast (Ljava/lang/Object;)V
Comment on lines -439 to -442
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is interesting, probably default interface methods?

public fun clear ()V
public final fun component1 ()Ljava/util/List;
public final fun component2 ()Lcom/github/ajalt/mordant/rendering/TextStyle;
Expand Down Expand Up @@ -467,10 +463,6 @@ public final class com/github/ajalt/mordant/rendering/Line : java/util/List, kot
public synthetic fun remove (I)Ljava/lang/Object;
public fun remove (Ljava/lang/Object;)Z
public fun removeAll (Ljava/util/Collection;)Z
public fun removeFirst ()Lcom/github/ajalt/mordant/rendering/Span;
public synthetic fun removeFirst ()Ljava/lang/Object;
public fun removeLast ()Lcom/github/ajalt/mordant/rendering/Span;
public synthetic fun removeLast ()Ljava/lang/Object;
public fun replaceAll (Ljava/util/function/UnaryOperator;)V
public fun retainAll (Ljava/util/Collection;)Z
public fun set (ILcom/github/ajalt/mordant/rendering/Span;)Lcom/github/ajalt/mordant/rendering/Span;
Expand Down
4 changes: 4 additions & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ pluginManagement {
mavenCentral()
}
}

plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}
5 changes: 5 additions & 0 deletions test/proguard/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ val r8JarProvider by tasks.register<JavaExec>("r8Jar") {
inputs.files(fatJarFile, rulesFile)
outputs.file(r8File)

javaLauncher = javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(22))
vendor = JvmVendorSpec.AZUL // Zulu
}
Comment on lines +54 to +57
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#233


classpath(r8)
mainClass.set("com.android.tools.r8.R8")
args = listOf(
Expand Down