chore: upgrade to sdk 35 and clean up ci workflows

jarnedemeulemeester · Jun 30, 2024 · 4398de4 · 4398de4
1 parent d8d0aba
commit 4398de4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -6,9 +6,6 @@ on:
       - main
   pull_request:
 
-env:
-  NDK_VER: 26.3.11579264
-
 jobs:
   build:
     name: Build
@@ -23,11 +20,6 @@ jobs:
           java-version: 17
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: /usr/local/lib/android/sdk/ndk/${{ env.NDK_VER }}
-          key: ${{ runner.os }}-${{ env.NDK_VER }}
       - name: Symlink SDK
         working-directory: ./buildscripts
         run: |

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -4,8 +4,6 @@ on:
   push:
     tags:
       - v*
-    branches:
-      - master
 
 jobs:
   publish:

diff --git a/buildscripts/include/depinfo.sh b/buildscripts/include/depinfo.sh
@@ -4,7 +4,7 @@
 
 v_sdk=11076708_latest
 v_ndk=26.3.11579264
-v_sdk_build_tools=34.0.0
+v_sdk_build_tools=35.0.0
 
 v_lua=5.2.4
 v_libass=0.17.2

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-android-plugin = "8.4.1"
+android-plugin = "8.5.0"
 androidx-annotation = "1.8.0"
 publish-plugin = "2.0.0"
 

diff --git a/libmpv/build.gradle.kts b/libmpv/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 
 android {
     namespace = "dev.jdtech.mpv"
-    compileSdk = 34
-    buildToolsVersion = "34.0.0"
+    compileSdk = 35
+    buildToolsVersion = "35.0.0"
     ndkVersion = "26.3.11579264"
 
     defaultConfig {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,8 +4,6 @@ on: @@
       push:
         tags:
           - v*
-        branches:
-          - master
     jobs:
       publish:
@@ Expand Down @@