File tree Expand file tree Collapse file tree 2 files changed +4
-10
lines changed Expand file tree Collapse file tree 2 files changed +4
-10
lines changed Original file line number Diff line number Diff line change @@ -76,13 +76,9 @@ def jmh_repositories(maven_servers = ["http://central.maven.org/maven2"]):
7676 )
7777
7878def _scala_construct_runtime_classpath (deps ):
79- scala_targets = [d .scala for d in deps if hasattr (d , "scala" )]
80- java_targets = [d .java for d in deps if hasattr (d , "java" )]
8179 files = []
82- for scala in scala_targets :
83- files .append (scala .transitive_runtime_jars )
84- for java in java_targets :
85- files .append (java .transitive_runtime_deps )
80+ [files .append (target [JavaInfo ].transitive_runtime_deps ) for target in deps if JavaInfo in target ]
81+
8682 return depset (transitive = files )
8783
8884def _scala_generate_benchmark (ctx ):
Original file line number Diff line number Diff line change @@ -42,10 +42,8 @@ def collect_plugin_paths(plugins):
4242 for p in plugins :
4343 if hasattr (p , "path" ):
4444 paths .append (p )
45- elif hasattr (p , "scala" ):
46- paths .extend ([j .class_jar for j in p .scala .outputs .jars ])
47- elif hasattr (p , "java" ):
48- paths .extend ([j .class_jar for j in p .java .outputs .jars ])
45+ elif JavaInfo in p :
46+ paths .extend ([j .class_jar for j in p [JavaInfo ].outputs .jars ])
4947 # support http_file pointed at a jar. http_jar uses ijar,
5048 # which breaks scala macros
5149
You can’t perform that action at this time.
0 commit comments