Expose one version enforcement level and allowlist to Starlark

PiperOrigin-RevId: 384414372
bazelbuild · Jul 13, 2021 · 19a3a44 · 19a3a44
1 parent 5b3eac0
commit 19a3a44
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
@@ -344,6 +344,11 @@ public OneVersionEnforcementLevel oneVersionEnforcementLevel() {
     return enforceOneVersion;
   }
 
+  @Override
+  public String starlarkOneVersionEnforcementLevel() {
+    return oneVersionEnforcementLevel().name();
+  }
+
   public boolean enforceOneVersionOnJavaTests() {
     return enforceOneVersionOnJavaTests;
   }

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainProvider.java
@@ -323,6 +323,7 @@ public Artifact getOneVersionBinary() {
 
   /** Return the {@link Artifact} of the allowlist used by the one-version compliance checker. */
   @Nullable
+  @Override
   public Artifact getOneVersionAllowlist() {
     return oneVersionAllowlist;
   }

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/java/JavaConfigurationApi.java
@@ -48,6 +48,12 @@ public interface JavaConfigurationApi extends StarlarkValue {
       doc = "Additional options to pass to the Java VM for each java_binary target")
   ImmutableList<String> getDefaultJvmFlags();
 
+  @StarlarkMethod(
+      name = "one_version_enforcement_level",
+      structField = true,
+      doc = "The value of the --experimental_one_version_enforcement flag.")
+  String starlarkOneVersionEnforcementLevel();
+
   @StarlarkMethod(
       name = "plugins",
       structField = true,

diff --git a/.../google/devtools/build/lib/starlarkbuildapi/java/JavaToolchainStarlarkApiProviderApi.java b/.../google/devtools/build/lib/starlarkbuildapi/java/JavaToolchainStarlarkApiProviderApi.java
@@ -51,6 +51,14 @@ public interface JavaToolchainStarlarkApiProviderApi extends StructApi {
   @StarlarkMethod(name = "single_jar", doc = "The SingleJar deploy jar.", structField = true)
   FileApi getSingleJar();
 
+  @StarlarkMethod(
+      name = "one_version_allowlist",
+      doc = "The allowlist used by the One-Version compliance checker",
+      structField = true,
+      allowReturnNones = true)
+  @Nullable
+  FileApi getOneVersionAllowlist();
+
   @StarlarkMethod(
       name = "bootclasspath",
       doc = "The Java target bootclasspath entries. Corresponds to javac's -bootclasspath flag.",