Order singlejar input jars in the same manner as original code

Author: andyscott

rules/scala/private/phases.bzl

@@ -291,11 +291,7 @@ def phase_singlejar(ctx, g):
     args.add("--exclude_build_data")
     args.add("--normalize")
 
-    for file in [f for f in ctx.files.resource_jars if f.extension.lower() in ["jar"]]:
-        args.add("--sources")
-        args.add(file)
-
-    for v in [getattr(g, k) for k in dir(g)[::-1] if k not in ["to_json", "to_proto"]]:
+    for v in [getattr(g, k) for k in dir(g) if k not in ["to_json", "to_proto"]]:
         if hasattr(v, "jar"):
             jar = getattr(v, "jar")
             args.add("--sources", jar)
@@ -306,6 +302,10 @@ def phase_singlejar(ctx, g):
             # any declared outputs are missing from previous phases.
             inputs.extend(getattr(v, "outputs"))
 
+    for file in [f for f in ctx.files.resource_jars if f.extension.lower() in ["jar"]]:
+        args.add("--sources")
+        args.add(file)
+
     args.add("--output", ctx.outputs.jar)
     args.add("--warn_duplicate_resources")
     args.set_param_file_format("multiline")