diff options
author | Irina Iancu <elenairina@google.com> | 2017-03-06 12:43:36 +0000 |
---|---|---|
committer | Vladimir Moskva <vladmos@google.com> | 2017-03-06 14:44:50 +0000 |
commit | 938f08acd01befd4d18b1537b051e9ccac9ab3b6 (patch) | |
tree | 517ff2d90c53fdcdf19f0d0b5e969bc17f5c886e | |
parent | e6d40b3571f8b1d3639ca37165c1009826b7b4ff (diff) |
provider.transitive_runtime_jars returns a SkylarkNestedSet instead of a SkylarkList.
--
PiperOrigin-RevId: 149286753
MOS_MIGRATED_REVID=149286753
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaProvider.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaProvider.java index 73ba8759b3..d66d4404bb 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaProvider.java @@ -16,6 +16,7 @@ package com.google.devtools.build.lib.rules.java; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.analysis.SkylarkProviders; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; @@ -24,10 +25,9 @@ import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; import com.google.devtools.build.lib.packages.ClassObjectConstructor; import com.google.devtools.build.lib.packages.NativeClassObjectConstructor; import com.google.devtools.build.lib.packages.SkylarkClassObject; -import com.google.devtools.build.lib.syntax.SkylarkList; +import com.google.devtools.build.lib.syntax.SkylarkNestedSet; import java.util.LinkedList; import java.util.List; -import java.util.Set; import javax.annotation.Nullable; /** A Skylark declared provider that encapsulates all providers that are needed by Java rules. */ @@ -37,7 +37,7 @@ public final class JavaProvider extends SkylarkClassObject implements Transitive public static final ClassObjectConstructor JAVA_PROVIDER = new NativeClassObjectConstructor("java_common.provider") { }; - private static final Set<Class<? extends TransitiveInfoProvider>> ALLOWED_PROVIDERS = + private static final ImmutableSet<Class<? extends TransitiveInfoProvider>> ALLOWED_PROVIDERS = ImmutableSet.of( JavaCompilationArgsProvider.class, JavaSourceJarsProvider.class, @@ -129,10 +129,10 @@ public final class JavaProvider extends SkylarkClassObject implements Transitive private JavaProvider(TransitiveInfoProviderMap providers) { super(JAVA_PROVIDER, ImmutableMap.<String, Object>of( - "transitive_runtime_jars", SkylarkList.createImmutable( + "transitive_runtime_jars", SkylarkNestedSet.of( + Artifact.class, providers.getProvider(JavaCompilationArgsProvider.class) - .getRecursiveJavaCompilationArgs() - .getRuntimeJars()) + .getRecursiveJavaCompilationArgs().getRuntimeJars()) )); this.providers = providers; } |