diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b5d2b1e..1a4d735 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -28,7 +28,7 @@ jobs: submodules: recursive - name: Set up JDK 11 - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6 with: java-version: '11' distribution: 'temurin' @@ -76,7 +76,7 @@ jobs: uses: conan-io/setup-conan@ed3942a6883243f4af84e13e49c972f9440fa1c2 # v1 - name: Set up JDK - uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5 + uses: actions/setup-java@dd06d9cba3e5552c54d9f8ea23572deb30010f7c # v6 with: java-version: '25' distribution: 'temurin' diff --git a/.gitmodules b/.gitmodules index 67e5770..e46bee2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "jni/libdatachannel"] path = jni/libdatachannel url = https://github.com/paullouisageneau/libdatachannel.git - branch = v0.24.4 + branch = v0.24.5 [submodule "jni/cmake-conan"] path = jni/cmake-conan url = https://github.com/conan-io/cmake-conan.git diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d953c1f..30b2605 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/jni/conanfile.py b/jni/conanfile.py index 1ed3c66..0f21a7d 100644 --- a/jni/conanfile.py +++ b/jni/conanfile.py @@ -9,7 +9,7 @@ class LibDataChannel(ConanFile): settings = "os", "arch", "compiler", "build_type" - requires = "openssl/3.6.3" + requires = "openssl/4.0.2" generators = "CMakeDeps" def configure(self): diff --git a/jni/libdatachannel b/jni/libdatachannel index 8e330ed..443f693 160000 --- a/jni/libdatachannel +++ b/jni/libdatachannel @@ -1 +1 @@ -Subproject commit 8e330edebfe766b44f59be427e0454fd18964d4e +Subproject commit 443f6934d9007eb7076ab7825ba330f355fcbead