Zhimin.Liu/ScrcpyForAndroid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Miuzarte/ScrcpyForAndroid

Browse Source
This commit is contained in:
zhimin.liu
2026-07-15 19:25:28 +08:00
parent 5a1a30ad83 b1ba9fcbea
commit f7ff48ff6c
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/android.yml vendored
View File

@@ -19,19 +19,19 @@ jobs:
RELEASE_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} RELEASE_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- name: Set up JDK 21 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v5
with: with:
java-version: "21" java-version: "21"
distribution: "temurin" distribution: "temurin"
cache: gradle cache: gradle
- uses: actions/cache@v4 - uses: actions/cache@v6
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches
@@ -40,7 +40,7 @@ jobs:
key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: gradle-deps- restore-keys: gradle-deps-
- uses: actions/cache@v4 - uses: actions/cache@v6
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*
@@ -98,19 +98,19 @@ jobs:
RELEASE_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} RELEASE_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- name: Set up JDK 21 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v5
with: with:
java-version: "21" java-version: "21"
distribution: "temurin" distribution: "temurin"
cache: gradle cache: gradle
- uses: actions/cache@v4 - uses: actions/cache@v6
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches
@@ -119,7 +119,7 @@ jobs:
key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: gradle-deps- restore-keys: gradle-deps-
- uses: actions/cache@v4 - uses: actions/cache@v6
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*

8
.github/workflows/renovate-check.yml vendored
View File

@@ -11,19 +11,19 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v7
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- name: Set up JDK 21 - name: Set up JDK 21
uses: actions/setup-java@v4 uses: actions/setup-java@v5
with: with:
java-version: "21" java-version: "21"
distribution: "temurin" distribution: "temurin"
cache: gradle cache: gradle
- uses: actions/cache@v4 - uses: actions/cache@v6
with: with:
path: | path: |
~/.gradle/caches ~/.gradle/caches
@@ -32,7 +32,7 @@ jobs:
key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: gradle-deps- restore-keys: gradle-deps-
- uses: actions/cache@v4 - uses: actions/cache@v6
with: with:
path: | path: |
~/.gradle/caches/build-cache-* ~/.gradle/caches/build-cache-*

11
app/build.gradle.kts
View File

@@ -106,6 +106,17 @@ android {
buildConfig = true buildConfig = true
} }
packaging {
resources {
excludes += listOf(
"META-INF/LICENSE.md",
"META-INF/LICENSE",
"META-INF/NOTICE.md",
"META-INF/NOTICE",
)
}
}
externalNativeBuild { externalNativeBuild {
cmake { cmake {
path = file("src/main/jni/CMakeLists.txt") path = file("src/main/jni/CMakeLists.txt")

4
gradle/libs.versions.toml
View File

@@ -1,8 +1,8 @@
[versions] [versions]
agp = "9.2.1" agp = "9.2.1"
bcpkixJdk18on = "1.84" bcpkixJdk18on = "1.85"
boringssl = "20251124" boringssl = "20251124"
conscryptAndroid = "2.5.3" conscryptAndroid = "2.6.1"
datastorePreferences = "1.2.1" datastorePreferences = "1.2.1"
kotlin = "2.4.0" kotlin = "2.4.0"
kotlinx-serialization = "1.11.0" kotlinx-serialization = "1.11.0"