Skip to content

Commit 1b19b82

Browse files
committed
feat(build): setup builds from develop
1 parent 87e532d commit 1b19b82

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

.github/workflows/build-android.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
name: Android Build APK
22

3+
env:
4+
BRANCH_NAME: ${{ github.base_ref || github.ref_name }}
5+
36
on:
47
push:
5-
tags:
6-
- '*'
8+
paths:
9+
- 'version.properties'
710
workflow_dispatch:
811
inputs:
912
single_apk:
@@ -32,7 +35,7 @@ jobs:
3235
java-version: 17
3336
distribution: adopt
3437

35-
- if: ${{ inputs.single_apk == true }}
38+
- if: ${{ inputs.single_apk == true || $BRANCH_NAME == 'develop' }}
3639
run: sed -i -e '/isEnable/s/true/false/' app/build.gradle.kts
3740

3841
- name: Set MAL Client ID

app/build.gradle.kts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ plugins {
88
id("com.google.devtools.ksp")
99
}
1010

11-
val properties = Properties()
12-
properties.load(project.rootProject.file("private.properties").reader())
11+
val properties = Properties().also {
12+
it.load(project.rootProject.file("private.properties").reader())
13+
}
14+
val versionProps = Properties().also {
15+
it.load(project.rootProject.file("version.properties").reader())
16+
}
1317

1418
android {
1519
compileSdk = 35
@@ -18,8 +22,8 @@ android {
1822
applicationId = "com.axiel7.moelist"
1923
minSdk = 23
2024
targetSdk = 35
21-
versionCode = 146
22-
versionName = "3.7.1"
25+
versionCode = versionProps.getProperty("code").toInt()
26+
versionName = versionProps.getProperty("name")
2327
setProperty("archivesBaseName", "moelist-v$versionName")
2428

2529
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

version.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
code = 146
2+
name = 3.7.1

0 commit comments

Comments
 (0)