Skip to content

Remove usage of Java14HomeAvailable requirement #26033

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

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Remove usage of Java14HomeAvailable requirement #26033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions ...integ-testing/src/main/groovy/org/gradle/test/preconditions/IntegTestPreconditions.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,13 @@ class IntegTestPreconditions {
}
}

static class JavaHomeWithDifferentVersionAvailable implements TestPrecondition {
@Override
boolean isSatisfied() throws Exception {
return AvailableJavaHomes.differentVersion != null
}
}

static final class HasMsBuild implements TestPrecondition {
@Override
boolean isSatisfied() {
Expand Down
2 changes: 1 addition & 1 deletion subprojects/internal-testing/src/main/resources/valid-precondition-combinations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ IntegTestPreconditions$IsDaemonExecutor
IntegTestPreconditions$IsEmbeddedExecutor
IntegTestPreconditions$IsLongLivingProcess
IntegTestPreconditions$Java11HomeAvailable
IntegTestPreconditions$Java14HomeAvailable
IntegTestPreconditions$Java7HomeAvailable
IntegTestPreconditions$Java8HomeAvailable
IntegTestPreconditions$Java8HomeAvailable,IntegTestPreconditions$Java11HomeAvailable
IntegTestPreconditions$Java8HomeAvailable,IntegTestPreconditions$Java9HomeAvailable
IntegTestPreconditions$JavaHomeWithDifferentVersionAvailable
IntegTestPreconditions$MoreThanOneJava8HomeAvailable
IntegTestPreconditions$MoreThanOneJava8HomeAvailable,IntegTestPreconditions$Java9HomeAvailable
IntegTestPreconditions$NotDaemonExecutor
Expand Down
15 changes: 9 additions & 6 deletions ...gins/src/integTest/groovy/org/gradle/java/compile/BasicJavaCompilerIntegrationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.gradle.java.compile

import org.gradle.api.Action
import org.gradle.integtests.fixtures.AbstractIntegrationSpec
import org.gradle.integtests.fixtures.AvailableJavaHomes
import org.gradle.internal.classanalysis.JavaClassUtil
import org.gradle.test.fixtures.file.ClassFile
import org.gradle.test.precondition.Requires
Expand Down Expand Up @@ -198,21 +199,23 @@ compileJava {
"""
}

@Requires(IntegTestPreconditions.Java14HomeAvailable)
@Requires(IntegTestPreconditions.JavaHomeWithDifferentVersionAvailable)
def 'computes target jvm version when using toolchain'() {
given:
def jdk = AvailableJavaHomes.differentVersion
def javaVersion = jdk.javaVersion.getMajorVersion()
goodCode()
buildFile << """
java.toolchain {
languageVersion = JavaLanguageVersion.of(14)
languageVersion = JavaLanguageVersion.of(${javaVersion})
}

compileJava {
doFirst {
assert configurations.apiElements.attributes.getAttribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE) == 14
assert configurations.runtimeElements.attributes.getAttribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE) == 14
assert configurations.compileClasspath.attributes.getAttribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE) == 14
assert configurations.runtimeClasspath.attributes.getAttribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE) == 14
assert configurations.apiElements.attributes.getAttribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE) == ${javaVersion}
assert configurations.runtimeElements.attributes.getAttribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE) == ${javaVersion}
assert configurations.compileClasspath.attributes.getAttribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE) == ${javaVersion}
assert configurations.runtimeClasspath.attributes.getAttribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE) == ${javaVersion}
}
}
"""
Expand Down