Merge branch '2.3.x' into 2.4.x

pull/26691/head
Andy Wilkinson 4 years ago
commit e29d2e208e

@ -156,14 +156,14 @@ class JavaPluginActionIntegrationTests {
@TestTemplate @TestTemplate
void productionRuntimeClasspathIsConfiguredWithResolvabilityAndConsumabilityThatMatchesRuntimeClasspath() { void productionRuntimeClasspathIsConfiguredWithResolvabilityAndConsumabilityThatMatchesRuntimeClasspath() {
String productionRuntime = this.gradleBuild.build("configurationResolvabilityAndConsumability",
"-PconfigurationName=runtimeClasspath", "-PapplyJavaPlugin").getOutput();
assertThat(productionRuntime).contains("canBeResolved: true");
assertThat(productionRuntime).contains("canBeConsumed: false");
String runtime = this.gradleBuild.build("configurationResolvabilityAndConsumability", String runtime = this.gradleBuild.build("configurationResolvabilityAndConsumability",
"-PconfigurationName=productionRuntimeClasspath", "-PapplyJavaPlugin").getOutput(); "-PconfigurationName=runtimeClasspath", "-PapplyJavaPlugin").getOutput();
assertThat(runtime).contains("canBeResolved: true"); assertThat(runtime).contains("canBeResolved: true");
assertThat(runtime).contains("canBeConsumed: false"); assertThat(runtime).contains("canBeConsumed: false");
String productionRuntime = this.gradleBuild.build("configurationResolvabilityAndConsumability",
"-PconfigurationName=productionRuntimeClasspath", "-PapplyJavaPlugin").getOutput();
assertThat(productionRuntime).contains("canBeResolved: true");
assertThat(productionRuntime).contains("canBeConsumed: false");
} }
private void createMinimalMainSource() throws IOException { private void createMinimalMainSource() throws IOException {

Loading…
Cancel
Save