Merge pull request #199 from infinyon/ac/ci-update-java

chore: ci bump java build env, clippy fixes

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
         rust: [stable]
         # Add Java 16 when https://github.com/gradle/gradle/issues/13481 has a
         # better work around.
-        java: [8, 11, 16, 17]
+        java: [17, 21]
         exclude:
           - os: macos-latest
             java: 8
@@ -31,10 +31,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install ${{ matrix.rust }}
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-          override: true
 
       - name: Setup java
         uses: actions/setup-java@v4
@@ -53,7 +52,7 @@ jobs:
 
       - name: Run Checkstyle
         run: |
-          make checkstyle          
+          make checkstyle
 
       - name: Upload Test Results
         timeout-minutes: 1

.github/workflows/do_release.yml

@@ -26,15 +26,13 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
+      - name: Install stable rust
+        uses: dtolnay/rust-toolchain@master
+
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 21
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v3
@@ -60,7 +58,7 @@ jobs:
       - name: Set up Java and credentials
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 21
           distribution: 'adopt'
       - name: Download MacOS Lib
         uses: actions/download-artifact@v4

build.rs

@@ -38,7 +38,7 @@ fn main() {
     let out_src = Path::new(&out_dir).join("java_glue.rs");
     let flap_gen =
         flapigen::Generator::new(LanguageConfig::JavaConfig(java_cfg)).rustfmt_bindings(true);
-    flap_gen.expand("java bindings", &in_src, &out_src);
+    flap_gen.expand("java bindings", &in_src, out_src);
     println!("cargo:rerun-if-changed={}", in_src.display());
 }