copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Add build tool version to android config (mihonapp/mihon#1803)

Browse source 
(cherry picked from commit 7566918ee749e76c701aeda7e99d81003676a51c)
This commit is contained in:
rhjdvsgsgks 2025-03-01 21:31:02 +00:00 committed by Cuong-Tran
parent b976778c08
commit 686a80555f
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
7 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build_benchmark.yml vendored
View file

@ -96,8 +96,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: Get SHA & clean up build artifacts - name: Get SHA & clean up build artifacts
id: get_sha id: get_sha

2
.github/workflows/build_preview.yml vendored
View file

@ -186,8 +186,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: Get SHA & clean up build artifacts - name: Get SHA & clean up build artifacts
id: get_sha id: get_sha

2
.github/workflows/build_pull_request.yml vendored
View file

@ -84,8 +84,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: Rename apk - name: Rename apk
id: current_commit id: current_commit

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

@ -82,8 +82,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: Rename apk - name: Rename apk
id: current_commit id: current_commit

2
.github/workflows/build_release.yml vendored
View file

@ -165,8 +165,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: Get SHA & clean up build artifacts - name: Get SHA & clean up build artifacts
id: get_sha id: get_sha

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