diff --git a/.github/workflows/build_benchmark.yml b/.github/workflows/build_benchmark.yml index 99488fc97..f544d5127 100644 --- a/.github/workflows/build_benchmark.yml +++ b/.github/workflows/build_benchmark.yml @@ -96,8 +96,6 @@ jobs: alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - BUILD_TOOLS_VERSION: '35.0.1' - name: Get SHA & clean up build artifacts id: get_sha diff --git a/.github/workflows/build_preview.yml b/.github/workflows/build_preview.yml index d81100778..3ab0025c5 100644 --- a/.github/workflows/build_preview.yml +++ b/.github/workflows/build_preview.yml @@ -186,8 +186,6 @@ jobs: alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - BUILD_TOOLS_VERSION: '35.0.1' - name: Get SHA & clean up build artifacts id: get_sha diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index f419fdcf0..b9d8543a0 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -84,8 +84,6 @@ jobs: alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - BUILD_TOOLS_VERSION: '35.0.1' - name: Rename apk id: current_commit diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index b17ad53c5..36d458f8c 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -82,8 +82,6 @@ jobs: alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - BUILD_TOOLS_VERSION: '35.0.1' - name: Rename apk id: current_commit diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 1b690cab7..d99a98167 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -165,8 +165,6 @@ jobs: alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - BUILD_TOOLS_VERSION: '35.0.1' - name: Get SHA & clean up build artifacts id: get_sha diff --git a/buildSrc/src/main/kotlin/mihon/buildlogic/AndroidConfig.kt b/buildSrc/src/main/kotlin/mihon/buildlogic/AndroidConfig.kt index 5c4dd9ea3..84297b927 100644 --- a/buildSrc/src/main/kotlin/mihon/buildlogic/AndroidConfig.kt +++ b/buildSrc/src/main/kotlin/mihon/buildlogic/AndroidConfig.kt @@ -8,6 +8,7 @@ object AndroidConfig { const val TARGET_SDK = 34 const val MIN_SDK = 26 const val NDK = "27.1.12297006" + const val BUILD_TOOLS = "35.0.1" // https://youtrack.jetbrains.com/issue/KT-66995/JvmTarget-and-JavaVersion-compatibility-for-easier-JVM-version-setup val JavaVersion = GradleJavaVersion.VERSION_17 diff --git a/buildSrc/src/main/kotlin/mihon/buildlogic/ProjectExtensions.kt b/buildSrc/src/main/kotlin/mihon/buildlogic/ProjectExtensions.kt index 1895887a2..66140d115 100644 --- a/buildSrc/src/main/kotlin/mihon/buildlogic/ProjectExtensions.kt +++ b/buildSrc/src/main/kotlin/mihon/buildlogic/ProjectExtensions.kt @@ -26,6 +26,7 @@ val Project.libs get() = the() internal fun Project.configureAndroid(commonExtension: CommonExtension<*, *, *, *, *, *>) { commonExtension.apply { compileSdk = AndroidConfig.COMPILE_SDK + buildToolsVersion = AndroidConfig.BUILD_TOOLS defaultConfig { minSdk = AndroidConfig.MIN_SDK