Skip to content

Commit ddbf5f4

Browse files
committed
Update project
1 parent f8ee5f2 commit ddbf5f4

File tree

2 files changed

+6
-52
lines changed

2 files changed

+6
-52
lines changed

androidApp/build.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import com.google.firebase.appdistribution.gradle.AppDistributionExtension
2-
import java.io.FileInputStream
32
import org.apache.commons.io.output.ByteArrayOutputStream
43
import org.jetbrains.kotlin.konan.properties.Properties
4+
import java.io.FileInputStream
55

66
@Suppress("dsl_scope_violation")
77

@@ -69,7 +69,7 @@ android {
6969

7070
signingConfigs {
7171
val keystoreProperties = Properties()
72-
val keystorePropertiesFile: File = rootProject.file("config/keystore.properties")
72+
val keystorePropertiesFile = rootProject.file("config/keystore.properties")
7373
if (keystorePropertiesFile.exists()) {
7474
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
7575
} else {
@@ -78,10 +78,11 @@ android {
7878
keystoreProperties["storePassword"] = System.getenv("KEYSTORE_STORE_PASSWORD").orEmpty()
7979
keystoreProperties["storeFile"] = System.getenv("KEYSTORE_FILE").orEmpty()
8080
}
81-
create("release") { // todo Uncomment to create a signed release
81+
val keystoreFile = keystoreProperties["storeFile"] as String
82+
create("release") {
8283
keyAlias = keystoreProperties["keyAlias"] as String
8384
keyPassword = keystoreProperties["keyPassword"] as String
84-
storeFile = file(keystoreProperties["storeFile"] as String)
85+
storeFile = if (keystoreFile.isNotEmpty()) file(keystoreFile) else null
8586
storePassword = keystoreProperties["storePassword"] as String
8687
}
8788
}
@@ -90,13 +91,12 @@ android {
9091
release {
9192
isMinifyEnabled = true
9293
isShrinkResources = true
93-
signingConfig = signingConfigs.getByName("release") // todo Uncomment to create a signed release
94+
signingConfig = signingConfigs.getByName("release")
9495
applicationIdSuffix = MoviesBuildType.RELEASE.applicationIdSuffix
9596
manifestPlaceholders += mapOf("appName" to "@string/app_name")
9697
proguardFiles(
9798
getDefaultProguardFile("proguard-android-optimize.txt"),
9899
"proguard-rules.pro",
99-
"retrofit2.pro",
100100
"okhttp3.pro",
101101
"coroutines.pro"
102102
)
@@ -108,7 +108,6 @@ android {
108108
applicationIdSuffix = MoviesBuildType.DEBUG.applicationIdSuffix
109109
manifestPlaceholders += mapOf("appName" to "@string/app_name_dev")
110110
isDefault = true
111-
//vcsInfo { include = true } // Version control system integration in App Quality Insights
112111
}
113112
create("benchmark") {
114113
initWith(getByName("release"))

androidApp/retrofit2.pro

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)