Support for non bzlmod consumption (#210)

* Support for non bzlmod consumption

WORKSPACE logic should still work

Fixes Support consuming bazel-diff without bzlmod #209

* more updates

* more updates

* more updates

* more updates

* more updates

* more updates

* more updates

* more updates

* more updates

* more updates

* updates

Author: tinder-maxwellelliott

.bazelrc

@@ -1,4 +1,4 @@
-run -c opt --show_loading_progress=false --show_progress=false --ui_event_filters='ERROR'
-run:verbose -c dbg --show_loading_progress=true --show_progress=true --ui_event_filters='INFO,ERROR,DEBUG'
+run -c opt --show_loading_progress=false --show_progress=false --ui_event_filters=error
+run:verbose -c dbg --show_loading_progress=true --show_progress=true --ui_event_filters=info,error,debug
 # https://github.com/mockito/mockito/issues/1879
 test --sandbox_tmpfs_path=/tmp

.github/workflows/ci.yaml

@@ -7,15 +7,14 @@ on:
     branches: [ master ]
 
 jobs:
-  test-jre8:
+  test-jre11-bzlmod:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Java JDK
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '8'
-        id: java
+          java-version: '11'
       - name: Setup Go environment
         uses: actions/setup-go@v3
         with:
@@ -25,37 +24,7 @@ jobs:
         run: go install github.com/bazelbuild/bazelisk@latest && export PATH=$PATH:$(go env GOPATH)/bin
       - uses: actions/checkout@v3
       - name: Run bazel-diff tests
-        run: ~/go/bin/bazelisk test //cli/...
-      - name: archive testlogs
-        if: always()
-        run: cp -R $(~/go/bin/bazelisk info bazel-testlogs) ./test-logs; (cd test-logs; zip -r -X ../test-logs.zip .)
-      - name: Save test logs
-        uses: actions/upload-artifact@master
-        if: always()
-        with:
-          name: test-logs-jre8
-          path: test-logs.zip
-  test-jre8-run-example:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '8'
-        id: java
-      - name: Setup Go environment
-        uses: actions/setup-go@v3
-        with:
-          go-version: ^1.17
-        id: go
-      - name: Setup Bazelisk
-        run: go install github.com/bazelbuild/bazelisk@latest && export PATH=$PATH:$(go env GOPATH)/bin
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Run bazel-diff example script
-        run: ./bazel-diff-example.sh "$GITHUB_WORKSPACE" ~/go/bin/bazelisk $(git rev-parse HEAD~1) $(git rev-parse HEAD)
+        run: ~/go/bin/bazelisk coverage --combined_report=lcov //cli/... --enable_bzlmod=true
   test-jre11:
     runs-on: ubuntu-latest
     steps:
@@ -73,16 +42,7 @@ jobs:
         run: go install github.com/bazelbuild/bazelisk@latest && export PATH=$PATH:$(go env GOPATH)/bin
       - uses: actions/checkout@v3
       - name: Run bazel-diff tests
-        run: ~/go/bin/bazelisk coverage --combined_report=lcov //cli/...
-      - name: archive testlogs
-        if: always()
-        run: cp -R $(~/go/bin/bazelisk info bazel-testlogs) ./test-logs; (cd test-logs; zip -r -X ../test-logs.zip .)
-      - name: Save test logs
-        uses: actions/upload-artifact@master
-        if: always()
-        with:
-          name: test-logs-jre11
-          path: test-logs.zip
+        run: ~/go/bin/bazelisk coverage --combined_report=lcov //cli/... --enable_bzlmod=false
   test-jre11-run-example:
     runs-on: ubuntu-latest
     steps:
@@ -105,11 +65,11 @@ jobs:
       - name: Run bazel-diff example script
         run: ./bazel-diff-example.sh "$GITHUB_WORKSPACE" ~/go/bin/bazelisk $(git rev-parse HEAD~1) $(git rev-parse HEAD)
   deploy:
-    needs: [test-jre8, test-jre11]
+    needs: [test-jre11]
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '8' ]
+        java: [ '11' ]
     steps:
       - name: Setup Java JDK
         uses: actions/setup-java@v3

MODULE.bazel

@@ -7,6 +7,7 @@
 
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 bazel_dep(name = "rules_proto", version = "6.0.0-rc2")
+bazel_dep(name = "rules_java", version = "7.5.0")
 bazel_dep(name = "rules_kotlin", version = "1.9.1")
 bazel_dep(name = "rules_jvm_external", version = "6.0")