diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e8fee42..7010deb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,7 +9,7 @@ on: jobs: build: name: Build - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 5b3ef04..dd458a5 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -8,7 +8,7 @@ on: jobs: publish: name: Publish - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest environment: release if: ${{ contains(github.repository_owner, 'jarnedemeulemeester') || startsWith(github.ref, 'refs/tags/v') }} steps: diff --git a/buildscripts/include/depinfo.sh b/buildscripts/include/depinfo.sh index 1c8fd0d..9471cfa 100755 --- a/buildscripts/include/depinfo.sh +++ b/buildscripts/include/depinfo.sh @@ -3,19 +3,19 @@ ## Dependency versions v_sdk=11076708_latest -v_ndk=27.0.12077973 +v_ndk=27.1.12297006 v_sdk_build_tools=35.0.0 v_lua=5.2.4 v_libass=0.17.3 -v_harfbuzz=9.0.0 -v_fribidi=1.0.15 -v_freetype=2-13-2 +v_harfbuzz=10.0.1 +v_fribidi=1.0.16 +v_freetype=2-13-3 v_mbedtls=3.5.2 v_libplacebo=7.349.0 v_dav1d=1.4.3 v_ffmpeg=7.0.2 -v_mpv=0.38.0 +v_mpv=0.39.0 ## Dependency tree diff --git a/buildscripts/include/download-sdk.sh b/buildscripts/include/download-sdk.sh index f157c9c..ef317dc 100755 --- a/buildscripts/include/download-sdk.sh +++ b/buildscripts/include/download-sdk.sh @@ -61,10 +61,10 @@ sdkmanager () { "$exe" --sdk_root="${ANDROID_HOME}" "$@" } echo y | sdkmanager \ - "platforms;android-34" \ + "platforms;android-35" \ "build-tools;${v_sdk_build_tools}" \ "ndk;${v_ndk}" \ - "cmake;3.22.1" + "cmake;3.30.3" # gas-preprocessor mkdir -p bin diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 876a0eb..10ebc17 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -android-plugin = "8.5.2" +android-plugin = "8.6.1" androidx-annotation = "1.8.2" publish-plugin = "2.0.0" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 171d876..c44c230 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-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libmpv/build.gradle.kts b/libmpv/build.gradle.kts index 234cf45..27ac5ca 100755 --- a/libmpv/build.gradle.kts +++ b/libmpv/build.gradle.kts @@ -8,7 +8,7 @@ android { namespace = "dev.jdtech.mpv" compileSdk = 35 buildToolsVersion = "35.0.0" - ndkVersion = "27.0.12077973" + ndkVersion = "27.1.12297006" defaultConfig { minSdk = 26 @@ -28,7 +28,7 @@ android { externalNativeBuild { cmake { path = file("src/main/cpp/CMakeLists.txt") - version = "3.22.1" + version = "3.30.3" } }