Name the "standard-jvm" variants in Gradle Metadata "jre."

Small follow up to #3683 See: #6604 (comment) Fixes #6605 RELNOTES=n/a PiperOrigin-RevId: 544384609
google · Jun 29, 2023 · 1dc5f8c · 1dc5f8c
1 parent ce78fc6
commit 1dc5f8c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/android/pom.xml b/android/pom.xml
@@ -25,8 +25,10 @@
     <test.add.opens></test.add.opens>
     <module.status>integration</module.status>
     <variant.jvmEnvironment>android</variant.jvmEnvironment>
+    <variant.jvmEnvironmentVariantName>android</variant.jvmEnvironmentVariantName>
     <otherVariant.version>HEAD-jre-SNAPSHOT</otherVariant.version>
     <otherVariant.jvmEnvironment>standard-jvm</otherVariant.jvmEnvironment>
+    <otherVariant.jvmEnvironmentVariantName>jre</otherVariant.jvmEnvironmentVariantName>
   </properties>
   <issueManagement>
     <system>GitHub Issues</system>

diff --git 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
@@ -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
@@ -25,8 +25,10 @@
     <test.add.opens></test.add.opens>
     <module.status>integration</module.status>
     <variant.jvmEnvironment>standard-jvm</variant.jvmEnvironment>
+    <variant.jvmEnvironmentVariantName>jre</variant.jvmEnvironmentVariantName>
     <otherVariant.version>HEAD-android-SNAPSHOT</otherVariant.version>
     <otherVariant.jvmEnvironment>android</otherVariant.jvmEnvironment>
+    <otherVariant.jvmEnvironmentVariantName>android</otherVariant.jvmEnvironmentVariantName>
   </properties>
   <issueManagement>
     <system>GitHub Issues</system>