diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 596531b..620bbf4 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/do_release.yml b/.github/workflows/do_release.yml index d1dc9f9..866f51e 100644 --- a/.github/workflows/do_release.yml +++ b/.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 diff --git a/Cargo.lock b/Cargo.lock index 2626dac..de75051 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -830,7 +830,7 @@ dependencies = [ [[package]] name = "fluvio-java" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "bindgen", diff --git a/build.rs b/build.rs index 0750c54..75924c4 100644 --- a/build.rs +++ b/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()); }