Skip to content

Commit 95e0d2c

Browse files
committed
refactor: Update libraries and build file to latest versions
1 parent 3a0d21f commit 95e0d2c

File tree

2 files changed

+29
-20
lines changed

2 files changed

+29
-20
lines changed

app/build.gradle

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
*
1616
*/
1717

18-
apply plugin: 'com.android.application'
19-
apply plugin: 'kotlin-android'
20-
apply plugin: 'kotlin-kapt'
21-
apply plugin: "androidx.navigation.safeargs"
22-
apply plugin: 'kotlin-android-extensions'
18+
plugins {
19+
id 'com.android.application'
20+
id 'kotlin-android'
21+
id 'kotlin-kapt'
22+
id 'androidx.navigation.safeargs.kotlin'
23+
}
2324

2425
android {
2526
compileSdkVersion 30
2627
defaultConfig {
2728
applicationId "com.example.android.devbyteviewer"
28-
minSdkVersion 19
29+
minSdkVersion 21
2930
targetSdkVersion 30
3031
versionCode 1
3132
versionName "1.0"
@@ -38,11 +39,20 @@ android {
3839
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3940
}
4041
}
41-
42+
compileOptions {
43+
sourceCompatibility JavaVersion.VERSION_1_8
44+
targetCompatibility JavaVersion.VERSION_1_8
45+
}
46+
kotlinOptions {
47+
jvmTarget = '1.8'
48+
}
4249
buildFeatures {
4350
dataBinding true
4451
}
45-
52+
packagingOptions {
53+
exclude 'DebugProbesKt.bin'
54+
exclude 'META-INF/atomicfu.kotlin_module'
55+
}
4656
}
4757

4858
dependencies {
@@ -51,7 +61,7 @@ dependencies {
5161

5262
// Support libraries
5363
implementation "androidx.appcompat:appcompat:$version_appcompat"
54-
implementation "androidx.fragment:fragment:$version_fragment"
64+
implementation "androidx.fragment:fragment-ktx:$version_fragment"
5565
implementation "androidx.constraintlayout:constraintlayout:$version_constraint_layout"
5666

5767
// Android KTX
@@ -68,7 +78,6 @@ dependencies {
6878
// Retrofit for networking
6979
implementation "com.squareup.retrofit2:retrofit:$version_retrofit"
7080
implementation "com.squareup.retrofit2:converter-moshi:$version_retrofit"
71-
implementation "com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:$version_retrofit_coroutines_adapter"
7281

7382
// Moshi for parsing the JSON format
7483
implementation "com.squareup.moshi:moshi:$version_moshi"

build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@
1919

2020
buildscript {
2121
ext {
22-
version_core = "1.3.1"
22+
version_core = "1.3.2"
2323
version_coroutine = "1.3.7"
2424
version_retrofit_coroutines_adapter = "0.9.2"
2525
version_navigation = '1.0.0'
26-
version_constraint_layout = "2.0.0"
27-
version_gradle = '4.0.1'
28-
version_kotlin = "1.3.72"
26+
version_constraint_layout = "2.0.4"
27+
version_gradle = '4.1.1'
28+
version_kotlin = "1.4.20"
2929
version_lifecycle_extensions = "2.2.0"
3030
lifecycle_version = "2.2.0"
3131
version_room = "2.2.5"
3232
version_appcompat = "1.2.0"
33-
version_fragment = "1.0.0"
34-
version_retrofit = "2.5.0"
35-
version_kotlin_coroutines = "1.1.0"
36-
version_moshi = "1.8.0"
37-
version_glide = "4.8.0"
38-
version_joda = "2.10"
33+
version_fragment = "1.2.5"
34+
version_retrofit = "2.9.0"
35+
version_kotlin_coroutines = "1.4.1"
36+
version_moshi = "1.11.0"
37+
version_glide = "4.11.0"
38+
version_joda = "2.10.7"
3939
version_work = "1.0.1"
4040
version_timber = "4.7.1"
4141
}

0 commit comments

Comments
 (0)