Skip to content

Commit 41885fe

Browse files
authored
Merge pull request android#44 from android/yaraki-Motion-update
Motion: Update dependencies
2 parents 698a8a4 + 6e3e56f commit 41885fe

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

Motion/.idea/codeStyles/Project.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Motion/app/build.gradle

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,34 +51,31 @@ android {
5151
dependencies {
5252
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
5353

54-
implementation 'androidx.core:core-ktx:1.2.0-alpha04'
55-
implementation 'androidx.fragment:fragment-ktx:1.2.0-beta01'
54+
implementation 'androidx.core:core-ktx:1.3.0'
55+
implementation 'androidx.fragment:fragment-ktx:1.2.4'
5656
implementation 'androidx.appcompat:appcompat:1.1.0'
57-
implementation 'androidx.transition:transition:1.3.0-beta01'
58-
implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha02'
59-
implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
57+
implementation 'androidx.transition:transition:1.3.1'
58+
implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'
59+
implementation 'androidx.recyclerview:recyclerview:1.1.0'
6060

61-
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
61+
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
6262

63-
def lifecycle_version = '2.2.0-alpha05'
64-
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
63+
def lifecycle_version = '2.2.0'
6564
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
6665
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
6766

68-
def paging_version = '2.1.0'
67+
def paging_version = '2.1.2'
6968
implementation "androidx.paging:paging-runtime-ktx:$paging_version"
7069

71-
implementation 'com.google.android.material:material:1.1.0-beta01'
70+
implementation 'com.google.android.material:material:1.1.0'
7271

7372
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
7473
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
7574

7675
implementation 'com.github.bumptech.glide:glide:4.9.0'
7776

7877
testImplementation 'junit:junit:4.12'
79-
80-
//noinspection GradleDependency
81-
testImplementation 'com.google.truth:truth:0.42'
78+
testImplementation 'com.google.truth:truth:1.0'
8279

8380
testImplementation 'androidx.test:core:1.2.0'
8481
androidTestImplementation 'androidx.test.ext:truth:1.2.0'

Motion/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.3.50'
19-
ext.navigation_version = '2.2.0-alpha03'
18+
ext.kotlin_version = '1.3.72'
19+
ext.navigation_version = '2.2.2'
2020
repositories {
2121
google()
2222
jcenter()
2323
}
2424
dependencies {
25-
classpath 'com.android.tools.build:gradle:3.5.1'
25+
classpath 'com.android.tools.build:gradle:3.6.3'
2626
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2727
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
2828
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jul 16 13:57:40 JST 2019
1+
#Thu May 28 14:24:57 JST 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-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

0 commit comments

Comments
 (0)