diff --git a/.github/workflows/android-test.yml b/.github/workflows/android-test.yml index f6d23aeae..402ee76f3 100644 --- a/.github/workflows/android-test.yml +++ b/.github/workflows/android-test.yml @@ -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 diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index f783077f6..1b3ef089f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -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 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7eda615fe..335c8485d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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") diff --git a/buildSrc/src/main/kotlin/Version.kt b/buildSrc/src/main/kotlin/Version.kt index f4df7a3af..1d06f04c9 100644 --- a/buildSrc/src/main/kotlin/Version.kt +++ b/buildSrc/src/main/kotlin/Version.kt @@ -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, ){ diff --git a/paddleocr/build.gradle.kts b/paddleocr/build.gradle.kts index 5961fd4d0..a7d795d51 100644 --- a/paddleocr/build.gradle.kts +++ b/paddleocr/build.gradle.kts @@ -16,7 +16,7 @@ android { minSdk = versions.mini testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" - ndkVersion = "29.0.14206865" + ndkVersion = versions.ndk externalNativeBuild { cmake { diff --git a/project-versions.json b/project-versions.json index e01eacdac..a0c5ce4d5 100644 --- a/project-versions.json +++ b/project-versions.json @@ -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" }