Skip to content

Commit 82f02c5

Browse files
committed
upate gradle
1 parent 8cab458 commit 82f02c5

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

app/build.gradle

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ android {
2626
}
2727
}
2828
compileOptions {
29-
sourceCompatibility JavaVersion.VERSION_1_8
30-
targetCompatibility JavaVersion.VERSION_1_8
29+
sourceCompatibility JavaVersion.VERSION_11
30+
targetCompatibility JavaVersion.VERSION_11
3131
}
3232
kotlinOptions {
33-
jvmTarget = '1.8'
33+
jvmTarget = JavaVersion.VERSION_11.toString()
3434
freeCompilerArgs += ['-Xopt-in=kotlin.RequiresOptIn']
3535
}
3636
buildFeatures { viewBinding true }
@@ -48,17 +48,13 @@ dependencies {
4848
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
4949

5050
// Coroutines
51-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-RC"
52-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-RC"
51+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
52+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
5353

5454
// Hilt
5555
implementation "com.google.dagger:hilt-android:$dagger_hilt_version"
5656
kapt "com.google.dagger:hilt-android-compiler:$dagger_hilt_version"
5757

58-
// Navigation
59-
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
60-
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
61-
6258
// Retrofit, Moshi Converter, OkHttp Logging
6359
implementation 'com.squareup.moshi:moshi-kotlin:1.12.0'
6460
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -68,7 +64,6 @@ dependencies {
6864
implementation "io.coil-kt:coil:1.4.0"
6965

7066
// Navigation
71-
def nav_version = "2.3.5"
7267
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
7368
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
7469

build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ buildscript {
33
ext {
44
kotlin_version = "1.6.10"
55
dagger_hilt_version = "2.40.5"
6+
coroutines_version = "1.6.0-RC"
7+
nav_version = "2.3.5"
8+
ktlint_version = "0.43.2"
69
}
710

811
repositories {
@@ -41,7 +44,7 @@ subprojects {
4144
target("**/*.kt")
4245

4346
// Spotless doesn't read .editorconfig yet: https://github.com/diffplug/spotless/issues/142
44-
ktlint('0.41.0').userData([
47+
ktlint(ktlint_version).userData([
4548
'indent_size' : '2',
4649
'ij_kotlin_imports_layout': '*',
4750
'end_of_line' : 'lf',
@@ -72,7 +75,7 @@ subprojects {
7275
kotlinGradle {
7376
target("**/*.gradle.kts", "*.gradle.kts")
7477

75-
ktlint('0.41.0').userData([
78+
ktlint(ktlint_version).userData([
7679
"indent_size" : "2",
7780
"ij_kotlin_imports_layout": "*",
7881
"end_of_line" : "lf",

0 commit comments

Comments
 (0)