Update examples to 4.11 and update to Java 17 (#79)

* Update examples to 4.11 and update to Java 17 * Update .bazelrc * Update .bazelrc * remove jdk setup from github workflows
robolectric · Nov 1, 2023 · b1c83b5 · b1c83b5
1 parent e61ce3e
commit b1c83b5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 17 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1 +1,3 @@
 common --enable_bzlmod
+# Android SDK 34 requires Java 17
+common --java_runtime_version=17
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,11 +11,6 @@ jobs:
     steps:
       - name: "Checkout the sources"
         uses: actions/checkout@v4
-      - name: "Install JDK 11"
-        uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "11"
       - name: "Setup Bazelisk"
         uses: bazelbuild/setup-bazelisk@v2
       - name: "Building //bazel:android-all"
@@ -27,11 +22,6 @@ jobs:
     steps:
       - name: "Checkout the sources"
         uses: actions/checkout@v4
-      - name: "Install JDK 11"
-        uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "11"
       - name: "Setup Bazelisk"
         uses: bazelbuild/setup-bazelisk@v2
       - name: "Running integration tests"
@@ -45,11 +35,6 @@ jobs:
     steps:
       - name: "Checkout the sources"
         uses: actions/checkout@v4
-      - name: "Install JDK 11"
-        uses: actions/setup-java@v3
-        with:
-          distribution: "zulu"
-          java-version: "11"
       - name: "Setup Bazelisk"
         uses: bazelbuild/setup-bazelisk@v2
       - name: "Linting Starlark"

diff --git a/examples/simple/.bazelrc b/examples/simple/.bazelrc
@@ -1 +1,3 @@
 common --enable_bzlmod
+# Android SDK 34 requires Java 17
+common --java_runtime_version=17
diff --git a/examples/simple/MODULE.bazel b/examples/simple/MODULE.bazel
@@ -14,7 +14,7 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
     artifacts = [
         "com.google.truth:truth:1.1.3",
-        "org.robolectric:robolectric:4.10.3",
+        "org.robolectric:robolectric:4.11",
     ],
     repositories = [
         "https://maven.google.com",

diff --git a/examples/simple/WORKSPACE b/examples/simple/WORKSPACE
@@ -45,7 +45,7 @@ maven_install(
     name = "maven",
     artifacts = [
         "com.google.truth:truth:1.1.3",
-        "org.robolectric:robolectric:4.10.3",
+        "org.robolectric:robolectric:4.11",
     ],
     repositories = [
         "https://maven.google.com",