Skip to content

Commit a9f0bd8

Browse files
committed
update gradle and AGP
1 parent 6154a4d commit a9f0bd8

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ This project brings to the table set of best practices, tools, and solutions:
2424
- Firebase: Firestore, Authentication, Storage, Analytics, Crashlytics
2525
- Gradle Kotlin DSL, Custom plugin
2626

27+
## Download APK
28+
29+
[Download latest debug APK here](https://nightly.link/hoc081098/ComicReaderApp_MVI_Coroutine_RxKotlin_Jetpack/workflows/build/master/app-debug.zip)
30+
2731
# Develop
2832
- Clone: `git clone https://github.com/hoc081098/ComicReaderApp_MVI_Coroutine_RxKotlin.git`
2933
- _Optional: **Delete `.idea` folder** if cannot open project_

buildSrc/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ gradlePlugin {
2222

2323
object PluginVersions {
2424
const val kotlin = "1.5.0"
25-
const val androidGradle = "7.0.0-alpha14"
25+
const val androidGradle = "7.0.0-alpha15"
2626
const val navigationSafeArgs = "2.3.1"
2727
const val googleServices = "4.3.4"
2828
const val crashlytics = "2.4.1"

buildSrc/src/main/kotlin/Configurations.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ object appConfig {
1717
"$x.$y.$z $date"
1818
}
1919

20-
val supportedLocales = listOf("en")
20+
val supportedLocales = setOf("en")
2121
}
2222

2323
object versions {
@@ -32,7 +32,7 @@ object versions {
3232

3333
object kotlin {
3434
const val core = "1.5.0"
35-
const val coroutines = "1.5.0-RC"
35+
const val coroutines = "1.5.0"
3636
}
3737

3838
object androidX {

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,12 @@ private fun Project.configKotlinOptions() {
9393
}
9494

9595
private fun Project.configAndroidLibrary() = libraryExtension.run {
96-
compileSdkVersion(versions.sdk.compile)
97-
buildToolsVersion(versions.sdk.buildTools)
96+
compileSdk = versions.sdk.compile
97+
buildToolsVersion = versions.sdk.buildTools
9898

9999
defaultConfig {
100-
minSdkVersion(versions.sdk.min)
101-
targetSdkVersion(versions.sdk.target)
102-
versionCode = appConfig.versionCode
103-
versionName = appConfig.versionName
100+
minSdk = versions.sdk.min
101+
targetSdk = versions.sdk.target
104102

105103
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
106104
consumerProguardFiles("consumer-rules.pro")
@@ -130,13 +128,13 @@ private fun Project.configAndroidApplication() = appExtension.run {
130128
defaultConfig {
131129
applicationId = appConfig.applicationId
132130

133-
minSdkVersion(versions.sdk.min)
134-
targetSdkVersion(versions.sdk.target)
131+
minSdk = versions.sdk.min
132+
targetSdk = versions.sdk.target
135133

136134
versionCode = appConfig.versionCode
137135
versionName = appConfig.versionName
138136

139-
resConfigs(appConfig.supportedLocales)
137+
resourceConfigurations.addAll(appConfig.supportedLocales)
140138

141139
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
142140
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-all.zip

0 commit comments

Comments
 (0)