Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #23024 Fix the issue of provisioning the same tool…
…chain multiple times Fixes #22796 Co-authored-by: József Bartók <jbartok@gradle.com>
- Loading branch information
Showing
4 changed files
with
279 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
222 changes: 222 additions & 0 deletions
222
...egTest/groovy/org/gradle/jvm/toolchain/JavaToolchainDownloadComplexProjectSoakTest.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,222 @@ | ||
| /* | ||
| * Copyright 2022 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.gradle.jvm.toolchain | ||
|
|
||
| import org.gradle.integtests.fixtures.AbstractIntegrationSpec | ||
| import spock.lang.Ignore | ||
|
|
||
| class JavaToolchainDownloadComplexProjectSoakTest extends AbstractIntegrationSpec { | ||
|
|
||
| def setup() { | ||
| executer.requireOwnGradleUserHomeDir() | ||
| executer.withToolchainDownloadEnabled() | ||
| } | ||
|
|
||
| def "multiple subprojects with identical toolchain definitions"() { | ||
| given: | ||
| settingsFile << settingsForBuildWithSubprojects() | ||
|
|
||
| setupSubproject("subproject1", "Foo", "ADOPTIUM") | ||
| setupSubproject("subproject2", "Bar", "ADOPTIUM") | ||
|
|
||
| when: | ||
| result = executer | ||
| .withTasks("compileJava") | ||
| .run() | ||
|
|
||
| then: | ||
| !result.plainTextOutput.matches("(?s).*The existing installation will be replaced by the new download.*") | ||
| } | ||
|
|
||
| def "multiple subprojects with different toolchain definitions"() { | ||
| given: | ||
| settingsFile << settingsForBuildWithSubprojects() | ||
|
|
||
| setupSubproject("subproject1", "Foo", "ADOPTIUM") | ||
| setupSubproject("subproject2", "Bar", "ORACLE") | ||
|
|
||
| when: | ||
| result = executer | ||
| .withTasks("compileJava") | ||
| .withArgument("--info") | ||
| .run() | ||
|
|
||
| then: | ||
| result.plainTextOutput.matches("(?s).*Compiling with toolchain.*adoptium.*") | ||
| result.plainTextOutput.matches("(?s).*Compiling with toolchain.*oracle.*") | ||
| } | ||
|
|
||
| private String settingsForBuildWithSubprojects() { | ||
| return """ | ||
| plugins { | ||
| id 'org.gradle.toolchains.foojay-resolver-convention' version '0.2' | ||
| } | ||
| rootProject.name = 'main' | ||
| include('subproject1') | ||
| include('subproject2') | ||
| """ | ||
| } | ||
|
|
||
| private void setupSubproject(String subprojectName, String className, String vendorName) { | ||
| file("${subprojectName}/build.gradle") << """ | ||
| plugins { | ||
| id 'java' | ||
| } | ||
| java { | ||
| toolchain { | ||
| languageVersion = JavaLanguageVersion.of(11) | ||
| vendor = JvmVendorSpec.${vendorName} | ||
| } | ||
| } | ||
| """ | ||
| file("${subprojectName}/src/main/java/${className}.java") << "public class ${className} {}" | ||
| } | ||
|
|
||
| @Ignore("this test doesn't really test anything as is; see TODO in setupIncludedBuild()") | ||
| def "included build with different toolchain repository definition"() { | ||
| given: | ||
| settingsFile << settingsForBuildWithIncludedBuilds() | ||
| buildFile << buildConfigForBuildWithIncludedBuilds() | ||
|
|
||
| setupIncludedBuild() | ||
|
|
||
| when: | ||
| result = executer | ||
| .withTasks("compileJava") | ||
| .withArgument("--info") | ||
| .run() | ||
|
|
||
| then: | ||
| result.plainTextOutput.matches("(?s).*Compiling with toolchain.*") | ||
| } | ||
|
|
||
| private String settingsForBuildWithIncludedBuilds() { | ||
| return """ | ||
| pluginManagement { | ||
| includeBuild 'plugin1' | ||
| } | ||
| plugins { | ||
| id 'org.gradle.toolchains.foojay-resolver-convention' version '0.2' | ||
| } | ||
| rootProject.name = 'main' | ||
| """ | ||
| } | ||
|
|
||
| private String buildConfigForBuildWithIncludedBuilds() { | ||
| return """ | ||
| plugins { | ||
| id 'java' | ||
| id 'org.example.plugin1' | ||
| } | ||
| java { | ||
| toolchain { | ||
| languageVersion = JavaLanguageVersion.of(11) | ||
| } | ||
| } | ||
| """ | ||
| } | ||
|
|
||
| private void setupIncludedBuild() { | ||
| /*file("plugin1/settings.gradle") << """ | ||
| abstract class CustomToolchainResolverPlugin implements Plugin<Settings> { | ||
| @Inject | ||
| protected abstract JavaToolchainResolverRegistry getToolchainResolverRegistry(); | ||
| void apply(Settings settings) { | ||
| settings.getPlugins().apply("jvm-toolchain-management"); | ||
| JavaToolchainResolverRegistry registry = getToolchainResolverRegistry(); | ||
| registry.register(CustomToolchainResolver.class); | ||
| } | ||
| } | ||
| import javax.inject.Inject | ||
| import java.util.Optional; | ||
| abstract class CustomToolchainResolver implements JavaToolchainResolver { | ||
| @Override | ||
| Optional<JavaToolchainDownload> resolve(JavaToolchainRequest request) { | ||
| URI uri = URI.create("https://good_for_nothing.com/"); | ||
| return Optional.of(JavaToolchainDownload.fromUri(uri)); | ||
| } | ||
| } | ||
| apply plugin: CustomToolchainResolverPlugin | ||
| toolchainManagement { | ||
| jvm { | ||
| javaRepositories { | ||
| repository('custom') { | ||
| resolverClass = CustomToolchainResolver | ||
| } | ||
| } | ||
| } | ||
| } | ||
| rootProject.name = 'plugin1' | ||
| """*/ //TODO: atm the included build will use the definition from its own settings file, so if this is the settings we use it won't be able to download toolchains; need to clarify if this ok in the long term | ||
| file("plugin1/settings.gradle") << """ | ||
| plugins { | ||
| id 'org.gradle.toolchains.foojay-resolver-convention' version '0.2' | ||
| } | ||
| rootProject.name = 'plugin1' | ||
| """ | ||
| file("plugin1/build.gradle") << """ | ||
| plugins { | ||
| id 'java-gradle-plugin' | ||
| } | ||
| java { | ||
| toolchain { | ||
| languageVersion = JavaLanguageVersion.of(11) | ||
| } | ||
| } | ||
| gradlePlugin { | ||
| plugins { | ||
| simplePlugin { | ||
| id = 'org.example.plugin1' | ||
| implementationClass = 'org.example.Plugin1' | ||
| } | ||
| } | ||
| } | ||
| """ | ||
| file("plugin1/src/main/java/Plugin1.java") << """ | ||
| package org.example; | ||
| import org.gradle.api.Plugin; | ||
| import org.gradle.api.Project; | ||
| public class Plugin1 implements Plugin<Project> { | ||
| @Override | ||
| public void apply(Project project) { | ||
| System.out.println("Plugin1 applied!"); | ||
| } | ||
| } | ||
| """ | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters