diff --git a/android/pom.xml b/android/pom.xml index ed5ac3b4b493..fa19282244d8 100644 --- a/android/pom.xml +++ b/android/pom.xml @@ -25,8 +25,10 @@ integration android + android HEAD-jre-SNAPSHOT standard-jvm + jre GitHub Issues diff --git a/guava/module.json b/guava/module.json index bf3ee35ba1bf..42bb4d33413b 100644 --- a/guava/module.json +++ b/guava/module.json @@ -16,7 +16,7 @@ }, "variants": [ { - "name": "${variant.jvmEnvironment}ApiElements", + "name": "${variant.jvmEnvironmentVariantName}ApiElements", "attributes": { "org.gradle.category": "library", "org.gradle.dependency.bundling": "external", @@ -85,7 +85,7 @@ ] }, { - "name": "${variant.jvmEnvironment}RuntimeElements", + "name": "${variant.jvmEnvironmentVariantName}RuntimeElements", "attributes": { "org.gradle.category": "library", "org.gradle.dependency.bundling": "external", @@ -150,7 +150,7 @@ ] }, { - "name": "${otherVariant.jvmEnvironment}ApiElements", + "name": "${otherVariant.jvmEnvironmentVariantName}ApiElements", "attributes": { "org.gradle.category": "library", "org.gradle.dependency.bundling": "external", @@ -219,7 +219,7 @@ ] }, { - "name": "${otherVariant.jvmEnvironment}RuntimeElements", + "name": "${otherVariant.jvmEnvironmentVariantName}RuntimeElements", "attributes": { "org.gradle.category": "library", "org.gradle.dependency.bundling": "external", diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts index 2ea35a88d22c..c66ff7c12d67 100644 --- a/integration-tests/gradle/build.gradle.kts +++ b/integration-tests/gradle/build.gradle.kts @@ -188,7 +188,7 @@ subprojects { candidates .find { val variantName = it.javaClass.getDeclaredMethod("getVariantName") - (variantName.invoke(it) as String).contains("standard-jvm") + (variantName.invoke(it) as String).contains("jre") } ?.apply { select(this) } } diff --git a/pom.xml b/pom.xml index d4056dbe2f95..feb9ca824891 100644 --- a/pom.xml +++ b/pom.xml @@ -25,8 +25,10 @@ integration standard-jvm + jre HEAD-android-SNAPSHOT android + android GitHub Issues