Update Rust crate tokio to 1.37.0

.github/workflows/ci.yml

@@ -0,0 +1,30 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ 21 ]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            reqwest-jni
+      - run: cargo install cross
+      - name: set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: zulu
+          cache: "gradle"
+      - name: Run Build
+        run: ./gradlew shadowJar

.github/workflows/publish-maven.yml

@@ -22,8 +22,8 @@ jobs:
       - name: set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
-          distribution: temurin
+          java-version: 21
+          distribution: zulu
           check-latest: true
           cache: "gradle"
       - name: Save Private Key

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id "maven-publish"
     id "signing"
     id "fr.stardustenterprises.rust.importer" version "3.2.5"
-    id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 repositories {
@@ -17,14 +17,14 @@ dependencies {
 // javac -h
 tasks.register('generateJniHeaders', JavaCompile) {
     classpath = sourceSets.main.compileClasspath
-    destinationDir file("${buildDir}/generated/jni")
+    destinationDir file("${layout.buildDirectory}/generated/jni")
     source = sourceSets.main.java
     options.compilerArgs += [
-            '-h', file("${buildDir}/generated/jni"),
-            '-d', file("${buildDir}/generated/jni-classes"),
+            '-h', file("${layout.buildDirectory}/generated/jni"),
+            '-d', file("${layout.buildDirectory}/generated/jni-classes"),
     ]
     doLast {
-        delete file("${buildDir}/generated/jni-classes")
+        delete file("${layout.buildDirectory}/generated/jni-classes")
     }
 }
 
@@ -36,6 +36,8 @@ rustImport {
 java {
     withSourcesJar()
     withJavadocJar()
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 signing {
@@ -44,8 +46,6 @@ signing {
 
 group = 'rocks.kavin'
 version = '1.0.13'
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
 
 publishing {
     repositories {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://downloads.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

renovate.json

@@ -13,6 +13,5 @@
             "automerge": true,
             "platformAutomerge": true
         }
-    ],
-    "enabledManagers": ["cargo", "github-actions"]
-}
+    ]
+}

reqwest-jni/Cargo.lock

@@ -799,9 +799,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",

reqwest-jni/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2021"
 [dependencies]
 jni = "0.21.1"
 reqwest = {version = "0.12.2", features = ["rustls-tls", "stream", "brotli", "gzip", "socks"], default-features = false}
-tokio = {version = "1.36.0", features = ["rt-multi-thread", "time"], default-features = false}
+tokio = {version = "1.37.0", features = ["rt-multi-thread", "time"], default-features = false}
 
 [lib]
 crate-type = ["cdylib"]