Skip to content

Commit 01c455b

Browse files
authored
Merge pull request material-components#61 from chrisbanes/cb/reply-updates
[Reply] Dependency updates
2 parents e4fa57d + e54afef commit 01c455b

File tree

4 files changed

+14
-22
lines changed

4 files changed

+14
-22
lines changed

Reply/app/build.gradle

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,26 @@ android {
4646
}
4747

4848
dependencies {
49-
implementation fileTree(dir: 'libs', include: ['*.jar'])
50-
5149
// Kotlin
52-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
50+
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
5351

5452
// AndroidX
55-
implementation 'androidx.appcompat:appcompat:1.1.0'
56-
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-rc1'
57-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
53+
implementation 'androidx.appcompat:appcompat:1.2.0'
54+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
5855
implementation 'androidx.recyclerview:recyclerview:1.1.0'
59-
implementation 'androidx.core:core-ktx:1.1.0'
56+
implementation 'androidx.core:core-ktx:1.3.2'
6057
implementation 'androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0'
6158
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
6259
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
6360

6461
// Glide
65-
implementation "com.github.bumptech.glide:glide:4.9.0"
62+
implementation "com.github.bumptech.glide:glide:4.11.0"
6663

6764
// Material Components
68-
implementation 'com.google.android.material:material:1.2.0'
65+
implementation 'com.google.android.material:material:1.2.1'
6966

7067
// Testing
71-
testImplementation 'junit:junit:4.12'
72-
androidTestImplementation 'androidx.test:runner:1.2.0'
73-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
68+
testImplementation 'junit:junit:4.13'
69+
androidTestImplementation 'androidx.test:runner:1.3.0'
70+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
7471
}

Reply/build.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
buildscript {
1616
ext {
17-
kotlin_version = '1.3.50'
18-
navigation_version = '2.2.0'
17+
kotlin_version = '1.4.10'
18+
navigation_version = '2.3.1'
1919
}
2020
repositories {
2121
google()
2222
jcenter()
2323
}
2424
dependencies{
25-
classpath 'com.android.tools.build:gradle:4.0.1'
25+
classpath 'com.android.tools.build:gradle:4.1.0'
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2727
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
2828

@@ -37,7 +37,3 @@ allprojects {
3737
jcenter()
3838
}
3939
}
40-
41-
task clean(type: Delete) {
42-
delete rootProject.buildDir
43-
}

Reply/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9-
android.enableJetifier=true
109
android.useAndroidX=true
1110
org.gradle.jvmargs=-Xmx1536m
1211
# When configured, Gradle will run in incubating parallel mode.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Aug 11 20:17:06 EDT 2020
1+
#Mon Nov 02 15:31:58 GMT 2020
22
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-6.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

0 commit comments

Comments
 (0)