diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index fd0280aad..c054ff923 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -66,8 +66,6 @@ jobs: alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - env: - BUILD_TOOLS_VERSION: '35.0.1' - name: Clean up build artifacts if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon' 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