Skip to content

Commit

Permalink
chore: update action
Browse files Browse the repository at this point in the history
- remove singConfig
  • Loading branch information
kkoshin authored Jun 14, 2024
1 parent 4169030 commit 04d4174
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 29 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,24 @@ jobs:

- run: gradle assembleRelease

- name: Sign app APK
- uses: r0adkll/sign-android-release@v1
name: Sign app APK
# ID used to access action output
id: sign_app
uses: ilharp/sign-android-release@nightly
with:
releaseDir: app/build/outputs/apk/release
signingKey: ${{ secrets.KEY_STORE_FILE }}
releaseDirectory: composeApp/build/outputs/apk/release
signingKeyBase64: ${{ secrets.KEY_STORE_BASE64 }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyAlias: ${{ secrets.ALIAS }}
alias: ${{ secrets.ALIAS }}
keyPassword: ${{ secrets.KEY_PASSWORD }}
env:
# override default build-tools version (33.0.0) -- optional
BUILD_TOOLS_VERSION: "34.0.0"

- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: signed-apks
path: app/build/outputs/apk/release/*.apk
path: ${{steps.sign_app.outputs.signedReleaseFile}}
if-no-files-found: error
retention-days: 20
25 changes: 2 additions & 23 deletions composeApp/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import java.io.FileInputStream
import java.text.SimpleDateFormat
import java.util.Date
import java.util.Properties

plugins {
alias(libs.plugins.kotlinMultiplatform)
Expand Down Expand Up @@ -52,8 +50,6 @@ kotlin {
}
}

val keystorePropertiesFile: File = rootProject.file("keystore.properties")

android {
namespace = "io.github.kkoshin.muse"
compileSdk = libs.versions.android.compileSdk.get().toInt()
Expand All @@ -67,27 +63,14 @@ android {
minSdk = libs.versions.android.minSdk.get().toInt()
targetSdk = libs.versions.android.targetSdk.get().toInt()
versionCode = 1
versionName = "0.1.0"
versionName = "0.1.0-alpha1"
ndk {
abiFilters.clear()
//noinspection ChromeOsAbiSupport
abiFilters += "arm64-v8a"
}
}

signingConfigs {
if (keystorePropertiesFile.exists()) {
val keystoreProperties = Properties()
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
create("release") {
keyAlias = keystoreProperties["keyAlias"].toString()
keyPassword = keystoreProperties["keyPassword"].toString()
storeFile = file(keystoreProperties["storeFile"]!!)
storePassword = keystoreProperties["storePassword"].toString()
}
}
}

applicationVariants.all {
outputs.all {
(this as com.android.build.gradle.internal.api.BaseVariantOutputImpl).outputFileName =
Expand All @@ -106,18 +89,14 @@ android {
applicationIdSuffix = ".debug"
}
release {
// 这里不配置签名,对应操作在外部进行
isMinifyEnabled = true
isShrinkResources = true

proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro",
)
if (keystorePropertiesFile.exists()) {
signingConfigs["release"]?.let {
signingConfig = it
}
}
}
}
compileOptions {
Expand Down

0 comments on commit 04d4174

Please sign in to comment.