Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/android-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
run: ./gradlew app:buildDocs
- name: Setup Android SDK
uses: android-actions/setup-android@v4
- name: Install NDK for strip task
run: sdkmanager --install "ndk;26.1.10909125"
- name: Install NDK for native build and strip task
run: sdkmanager --install "ndk;$(jq -r .ndk project-versions.json)"
- name: Build with Gradle
run: |
./gradlew autojs:buildJsModule
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
node-version: 20.x
- name: Setup Android SDK
uses: android-actions/setup-android@v4
- name: Install NDK for strip task
run: sdkmanager --install "ndk;26.1.10909125"
- name: Install NDK for native build and strip task
run: sdkmanager --install "ndk;$(jq -r .ndk project-versions.json)"
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v6.3.0

Expand Down
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ android {
targetSdk = versions.target
versionCode = versions.appVersionCode
versionName = versions.appVersionName
ndkVersion = versions.ndk
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
// multiDexEnabled = true
buildConfigField("boolean", "isMarket", "false")
Expand Down
2 changes: 2 additions & 0 deletions buildSrc/src/main/kotlin/Version.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ data class Versions(
val jdk: String = "17",
@SerializedName("mini")
val mini: Int = 26,
@SerializedName("ndk")
val ndk: String = "29.0.14206865",
@SerializedName("target")
val target: Int = 34,
){
Expand Down
2 changes: 1 addition & 1 deletion paddleocr/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ android {
minSdk = versions.mini
testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner"

ndkVersion = "29.0.14206865"
ndkVersion = versions.ndk

externalNativeBuild {
cmake {
Expand Down
1 change: 1 addition & 0 deletions project-versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"target": 34,
"mini": 27,
"buildTool": "34.0.0",
"ndk": "29.0.14206865",
"IDE": "Android Studio Bumblebee | 2021.1.1",
"JDK": "17"
}
Loading