Skip to content

Commit ca356f7

Browse files
committed
add keystore
1 parent 741479b commit ca356f7

File tree

6 files changed

+96
-2
lines changed

6 files changed

+96
-2
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Build Release APK
2+
3+
on:
4+
release:
5+
types: [ published ]
6+
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v2
12+
13+
- name: Set up JDK
14+
uses: actions/setup-java@v2
15+
with:
16+
distribution: 'zulu'
17+
java-version: '11'
18+
19+
- name: Make gradlew executable
20+
run: chmod +x ./gradlew
21+
22+
- name: Build release APK
23+
run: ./gradlew assembleRelease --warning-mode all --stacktrace
24+
25+
- name: Upload APK
26+
uses: actions/upload-artifact@v2
27+
with:
28+
name: app-release
29+
path: app/build/outputs/apk/release/*.apk
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Validate Gradle Wrapper
2+
on: [ push, pull_request ]
3+
4+
jobs:
5+
validation:
6+
name: "Validation"
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/[email protected]
10+
- uses: gradle/[email protected]

app/src/main/java/com/hoc/comicapp/ui/register/RegisterVM.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class RegisterVM(
150150
private fun isValidUser(user: User): Boolean {
151151
val (email, password, fullName) = user
152152
return getEmailError(email) === null &&
153-
getPasswordError(password) === null &&
154-
getFullNameError(fullName) === null
153+
getPasswordError(password) === null &&
154+
getFullNameError(fullName) === null
155155
}
156156
}

buildSrc/src/main/kotlin/com/hoc/comicapp/plugin/ComicAppPlugin.kt

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import org.gradle.kotlin.dsl.withType
1717
import org.jetbrains.kotlin.gradle.plugin.KotlinBasePluginWrapper
1818
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1919
import versions
20+
import java.lang.System.getenv
21+
import java.util.Properties
2022

2123
private inline val Project.libraryExtension get() = extensions.getByType<LibraryExtension>()
2224
private inline val Project.appExtension get() = extensions.getByType<AppExtension>()
@@ -148,7 +150,54 @@ private fun Project.configAndroidApplication() = appExtension.run {
148150
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
149151
}
150152

153+
signingConfigs {
154+
getByName("debug") {
155+
val keystoreProperties = Properties().apply {
156+
load(
157+
rootProject.file("keystore/debugkey.properties")
158+
.apply { check(exists()) }
159+
.reader()
160+
)
161+
}
162+
163+
keyAlias = keystoreProperties["keyAlias"] as String
164+
keyPassword = keystoreProperties["keyPassword"] as String
165+
storeFile = rootProject.file(keystoreProperties["storeFile"] as String).apply { check(exists()) }
166+
storePassword = keystoreProperties["storePassword"] as String
167+
}
168+
169+
create("release") {
170+
val keystoreProperties by lazy {
171+
Properties().apply {
172+
load(
173+
rootProject.file("keystore/debugkey.properties")
174+
.apply { check(exists()) }
175+
.reader()
176+
)
177+
}
178+
}
179+
180+
keyAlias = getenv("keyAlias") ?: keystoreProperties["keyAlias"] as String
181+
keyPassword = getenv("keyPassword") ?: keystoreProperties["keyPassword"] as String
182+
storeFile = (getenv("storeFile")?.let { rootProject.file(it) }
183+
?: rootProject.file(keystoreProperties["storeFile"] as String)).apply { check(exists()) }
184+
storePassword = getenv("storePassword") ?: keystoreProperties["storePassword"] as String
185+
186+
// Optional, specify signing versions used
187+
enableV1Signing = true
188+
enableV2Signing = true
189+
}
190+
}
191+
151192
buildTypes {
193+
getByName("debug") {
194+
isMinifyEnabled = false
195+
isShrinkResources = false
196+
197+
signingConfig = signingConfigs.getByName("debug")
198+
isDebuggable = true
199+
}
200+
152201
getByName("release") {
153202
isMinifyEnabled = true
154203
isShrinkResources = true
@@ -157,6 +206,8 @@ private fun Project.configAndroidApplication() = appExtension.run {
157206
getDefaultProguardFile("proguard-android-optimize.txt"),
158207
"proguard-rules.pro"
159208
)
209+
signingConfig = signingConfigs.getByName("release")
210+
isDebuggable = false
160211
}
161212
}
162213

keystore/debug.jks

2.42 KB
Binary file not shown.

keystore/debugkey.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
storePassword=android
2+
keyPassword=android
3+
keyAlias=androiddebugkey
4+
storeFile=keystore/debug.jks

0 commit comments

Comments
 (0)