Add bazel-flake

flake.nix

@@ -1,12 +1,13 @@
 {
-  description = "Bazel rules_scala flake";
+  description = "Bazel rules_scala3 flake";
 
   inputs = {
     nixpkgs.url = "nixpkgs/release-24.05";
     flake-utils.url = "github:numtide/flake-utils";
+    bazel.url = "git+ssh://[email protected]/timothyklim/bazel-flake.git";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, bazel }:
     with flake-utils.lib; with system; eachSystem [ aarch64-darwin aarch64-linux x86_64-linux ] (system:
       let
         pkgs = import nixpkgs {
@@ -20,7 +21,7 @@
         };
       in
       rec {
-        devShell = pkgs.callPackage ./shell.nix { };
+        devShell = pkgs.callPackage ./shell.nix { bazel = bazel.packages.${system}.default; };
         formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
       });
 }

shell.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, bazel }:
 
 with pkgs;
 
@@ -8,6 +8,6 @@ in
 mkShell {
   name = "rules_scala-env";
   nativeBuildInputs = [ jdk ];
-  buildInputs = [ bash bazel_7 bazel-buildtools python3 just fd ripgrep gnused nixpkgs-fmt ];
+  buildInputs = [ bash bazel bazel-buildtools python3 just fd ripgrep gnused nixpkgs-fmt ];
   LOCALE_ARCHIVE = lib.optionals stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
 }

tests/jmh/ArrayBench.scala

@@ -1,26 +1,31 @@
 package test
 
 import java.util.concurrent.TimeUnit.*
-
 import org.openjdk.jmh.annotations.*
+
 @State(Scope.Benchmark)
 class ArrayState:
-  val array = (1 to 100).toArray
-
+  val array: Array[Int] = (1 to 100).toArray
   val h = 123
 
 class ArrayBench:
   @Benchmark
-  @BenchmarkMode(Array(Mode.SingleShotTime, Mode.Throughput))
+  @BenchmarkMode(Array(Mode.Throughput))
   @OutputTimeUnit(MILLISECONDS)
+  @Warmup(iterations = 2, time = 100, timeUnit = MILLISECONDS)
+  @Measurement(iterations = 2, time = 100, timeUnit = MILLISECONDS)
+  @Fork(2)
   def testFold(state: ArrayState): Unit =
     val builder = Vector.newBuilder[Int]
     state.array.foldLeft(builder)(_ += _)
     ()
 
   @Benchmark
-  @BenchmarkMode(Array(Mode.SingleShotTime, Mode.Throughput))
+  @BenchmarkMode(Array(Mode.Throughput))
   @OutputTimeUnit(MILLISECONDS)
+  @Warmup(iterations = 2, time = 100, timeUnit = MILLISECONDS)
+  @Measurement(iterations = 2, time = 100, timeUnit = MILLISECONDS)
+  @Fork(2)
   def testArray(state: ArrayState): Unit =
     val builder = Vector.newBuilder[Int]
     var _i = 0
@@ -30,8 +35,11 @@ class ArrayBench:
     ()
 
   @Benchmark
-  @BenchmarkMode(Array(Mode.SingleShotTime, Mode.Throughput))
+  @BenchmarkMode(Array(Mode.Throughput))
   @OutputTimeUnit(MILLISECONDS)
+  @Warmup(iterations = 2, time = 100, timeUnit = MILLISECONDS)
+  @Measurement(iterations = 2, time = 100, timeUnit = MILLISECONDS)
+  @Fork(2)
   def testForeach(state: ArrayState): Unit =
     val builder = Vector.newBuilder[Int]
     state.array.foreach(builder += _)

tests/jmh/test

@@ -1,4 +1,7 @@
 #!/usr/bin/env -S bash -e
 . "$(dirname "$0")"/../common.sh
 
-bazel run :jmh
+bazel run :jmh -- \
+  -wi 2 -i 2 -f 2 \
+  -bm thrpt \
+  -tu ms

tests/providers/BUILD

@@ -47,7 +47,7 @@ configure_bootstrap_scala(
 
 declare_zinc_configuration(
     name = "provided_zinc_configuration",
-    compiler_bridge = ":compiler_bridge",
+    compiler_bridge = "@scala3_sbt_bridge//jar",
 )
 
 join_configurations(

tests/test-frameworks/mixed/junit.scala

@@ -1,7 +1,6 @@
 package annex.scalacheck
 
 import org.junit.Test
-import org.junit.Assert.*
 
 class JUnitTests:
 

tests/test-frameworks/mixed/test

@@ -2,5 +2,5 @@
 . "$(dirname "$0")"/../../common.sh
 
 out=$(bazel test :mixed)
-echo "$out" | grep 'should pop values in last-in-first-out order'
-echo "$out" | grep 'JUnit many success'
+echo "$out" | grep 'Dummy.foo: OK, proved property.'
+echo "$out" | grep 'Dummy.bar: OK, proved property.'