mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-03-03 19:34:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add build tool version to android config (#1803)

Browse Source
This commit is contained in:
rhjdvsgsgks 2025-03-01 21:31:02 +00:00 committed by GitHub
parent 7b70b40d30
commit 7566918ee7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_push.yml vendored
View File

@ -66,8 +66,6 @@ jobs:
alias: ${{ secrets.ALIAS }} alias: ${{ secrets.ALIAS }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
BUILD_TOOLS_VERSION: '35.0.1'
- name: Clean up build artifacts - name: Clean up build artifacts
if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon' if: startsWith(github.ref, 'refs/tags/') && github.repository == 'mihonapp/mihon'

1
buildSrc/src/main/kotlin/mihon/buildlogic/AndroidConfig.kt
View File

@ -8,6 +8,7 @@ object AndroidConfig {
const val TARGET_SDK = 34 const val TARGET_SDK = 34
const val MIN_SDK = 26 const val MIN_SDK = 26
const val NDK = "27.1.12297006" 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 // https://youtrack.jetbrains.com/issue/KT-66995/JvmTarget-and-JavaVersion-compatibility-for-easier-JVM-version-setup
val JavaVersion = GradleJavaVersion.VERSION_17 val JavaVersion = GradleJavaVersion.VERSION_17

1
buildSrc/src/main/kotlin/mihon/buildlogic/ProjectExtensions.kt
View File

@ -26,6 +26,7 @@ val Project.libs get() = the<LibrariesForLibs>()
internal fun Project.configureAndroid(commonExtension: CommonExtension<*, *, *, *, *, *>) { internal fun Project.configureAndroid(commonExtension: CommonExtension<*, *, *, *, *, *>) {
commonExtension.apply { commonExtension.apply {
compileSdk = AndroidConfig.COMPILE_SDK compileSdk = AndroidConfig.COMPILE_SDK
buildToolsVersion = AndroidConfig.BUILD_TOOLS
defaultConfig { defaultConfig {
minSdk = AndroidConfig.MIN_SDK minSdk = AndroidConfig.MIN_SDK