Merge pull request #52 from android/yaraki-update

yaraki · web-flow · commit b950d2b83df3 · 2020-10-28T18:06:34.000+09:00
Motion: Update dependencies
diff --git a/Motion/.idea/misc.xml b/Motion/.idea/misc.xml
diff --git a/Motion/app/build.gradle b/Motion/app/build.gradle
@@ -19,12 +19,12 @@ apply plugin: 'kotlin-android'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId 'com.example.android.motion'
         minSdkVersion 14
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName '1.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -51,14 +51,14 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.4'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.fragment:fragment-ktx:1.2.5'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.transition:transition:1.3.1'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta6'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.3'
 
     def lifecycle_version = '2.2.0'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
@@ -67,18 +67,18 @@ dependencies {
     def paging_version = '2.1.2'
     implementation "androidx.paging:paging-runtime-ktx:$paging_version"
 
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.2.1'
 
     implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
 
     implementation 'com.github.bumptech.glide:glide:4.9.0'
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'com.google.truth:truth:1.0'
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'com.google.truth:truth:1.0.1'
 
-    testImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.test.ext:truth:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.test.ext:truth:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
diff --git a/Motion/app/src/androidTest/java/com/example/android/motion/demo/SequentialTransitionSetTest.kt b/Motion/app/src/androidTest/java/com/example/android/motion/demo/SequentialTransitionSetTest.kt
@@ -59,13 +59,13 @@ class SequentialTransitionSetTest {
 
         set[0].interpolator!!.let { interpolator ->
             val si = interpolator as SegmentInterpolator
-            assertThat(si.base).isSameAs(set.interpolator)
+            assertThat(si.base).isSameInstanceAs(set.interpolator)
             assertThat(si.start).isEqualTo(0f)
             assertThat(si.end).isEqualTo(0.5f)
         }
         set[1].interpolator!!.let { interpolator ->
             val si = interpolator as SegmentInterpolator
-            assertThat(si.base).isSameAs(set.interpolator)
+            assertThat(si.base).isSameInstanceAs(set.interpolator)
             assertThat(si.start).isEqualTo(0.5f)
             assertThat(si.end).isEqualTo(1f)
         }
@@ -81,13 +81,13 @@ class SequentialTransitionSetTest {
 
         set[0].interpolator!!.let { interpolator ->
             val si = interpolator as SegmentInterpolator
-            assertThat(si.base).isSameAs(set.interpolator)
+            assertThat(si.base).isSameInstanceAs(set.interpolator)
             assertThat(si.start).isEqualTo(0f)
             assertThat(si.end).isEqualTo(0.5f)
         }
         set[1].interpolator!!.let { interpolator ->
             val si = interpolator as SegmentInterpolator
-            assertThat(si.base).isSameAs(set.interpolator)
+            assertThat(si.base).isSameInstanceAs(set.interpolator)
             assertThat(si.start).isEqualTo(0.5f)
             assertThat(si.end).isEqualTo(1f)
         }
@@ -103,15 +103,15 @@ class SequentialTransitionSetTest {
 
         set[0].interpolator!!.let { interpolator ->
             val si = interpolator as SegmentInterpolator
-            assertThat(si.base).isSameAs(set.interpolator)
+            assertThat(si.base).isSameInstanceAs(set.interpolator)
             assertThat(si.start).isEqualTo(0f)
             assertThat(si.end).isEqualTo(0.4f)
             assertThat(si.getInterpolation(0f)).isWithin(0.01f).of(0f)
             assertThat(si.getInterpolation(1f)).isWithin(0.01f).of(1f)
         }
         set[1].interpolator!!.let { interpolator ->
             val si = interpolator as SegmentInterpolator
-            assertThat(si.base).isSameAs(set.interpolator)
+            assertThat(si.base).isSameInstanceAs(set.interpolator)
             assertThat(si.start).isEqualTo(0.4f)
             assertThat(si.end).isEqualTo(1f)
             assertThat(si.getInterpolation(0f)).isWithin(0.01f).of(0f)
diff --git a/Motion/app/src/main/AndroidManifest.xml b/Motion/app/src/main/AndroidManifest.xml
@@ -19,6 +19,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.example.android.motion">
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+        </intent>
+    </queries>
+
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/dissolve/DissolveActivity.kt b/Motion/app/src/main/java/com/example/android/motion/demo/dissolve/DissolveActivity.kt
@@ -21,7 +21,6 @@ import android.widget.ImageView
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
-import androidx.lifecycle.observe
 import androidx.transition.TransitionManager
 import com.example.android.motion.R
 import com.example.android.motion.demo.FAST_OUT_SLOW_IN
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/fabtransformation/FabTransformationActivity.kt b/Motion/app/src/main/java/com/example/android/motion/demo/fabtransformation/FabTransformationActivity.kt
@@ -28,7 +28,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
-import androidx.lifecycle.observe
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
 import com.example.android.motion.R
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/loading/LoadingActivity.kt b/Motion/app/src/main/java/com/example/android/motion/demo/loading/LoadingActivity.kt
@@ -22,7 +22,6 @@ import android.view.MenuItem
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
-import androidx.lifecycle.observe
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.Fade
 import androidx.transition.Transition
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/CheeseArticleFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/CheeseArticleFragment.kt
@@ -34,7 +34,6 @@ import androidx.core.view.updatePadding
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.transition.ChangeBounds
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/CheeseCardFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/navfadethrough/CheeseCardFragment.kt
@@ -31,7 +31,6 @@ import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.transition.Fade
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/oscillation/CheeseAdapter.kt b/Motion/app/src/main/java/com/example/android/motion/demo/oscillation/CheeseAdapter.kt
@@ -22,7 +22,6 @@ import android.widget.EdgeEffect
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.doOnLayout
-import androidx.core.view.doOnNextLayout
 import androidx.dynamicanimation.animation.SpringAnimation
 import androidx.dynamicanimation.animation.SpringForce
 import androidx.recyclerview.widget.ListAdapter
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/oscillation/OscillationActivity.kt b/Motion/app/src/main/java/com/example/android/motion/demo/oscillation/OscillationActivity.kt
@@ -20,7 +20,6 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
-import androidx.lifecycle.observe
 import androidx.recyclerview.widget.RecyclerView
 import com.example.android.motion.R
 import com.example.android.motion.ui.EdgeToEdge
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/reorder/CheeseGridAdapter.kt b/Motion/app/src/main/java/com/example/android/motion/demo/reorder/CheeseGridAdapter.kt
@@ -23,7 +23,6 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
-import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/reorder/ReorderActivity.kt b/Motion/app/src/main/java/com/example/android/motion/demo/reorder/ReorderActivity.kt
@@ -21,7 +21,6 @@ import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.ViewCompat
-import androidx.lifecycle.observe
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.example.android.motion.R
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseDetailFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseDetailFragment.kt
@@ -32,7 +32,6 @@ import androidx.core.view.updatePadding
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.transition.ChangeBounds
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseGridFragment.kt b/Motion/app/src/main/java/com/example/android/motion/demo/sharedelement/CheeseGridFragment.kt
@@ -27,7 +27,6 @@ import androidx.core.view.updateLayoutParams
 import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.Explode
 import androidx.transition.Slide
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/stagger/CheeseListAdapter.kt b/Motion/app/src/main/java/com/example/android/motion/demo/stagger/CheeseListAdapter.kt
@@ -21,7 +21,6 @@ import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.view.ViewGroupCompat
-import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
diff --git a/Motion/app/src/main/java/com/example/android/motion/demo/stagger/StaggerActivity.kt b/Motion/app/src/main/java/com/example/android/motion/demo/stagger/StaggerActivity.kt
@@ -22,7 +22,6 @@ import android.view.MenuItem
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
-import androidx.lifecycle.observe
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.RecyclerView
 import androidx.transition.TransitionManager
diff --git a/Motion/app/src/main/java/com/example/android/motion/ui/demolist/DemoListAdapter.kt b/Motion/app/src/main/java/com/example/android/motion/ui/demolist/DemoListAdapter.kt
@@ -76,7 +76,7 @@ internal class DemoViewHolder(
         label.text = demo.label
         description.text = demo.description
         description.isVisible = demo.description != null
-        for (i in 0 until apis.size) {
+        for (i in apis.indices) {
             if (demo.apis.size > i) {
                 apis[i].run {
                     text = demo.apis[i]
diff --git a/Motion/app/src/main/java/com/example/android/motion/ui/demolist/DemoListFragment.kt b/Motion/app/src/main/java/com/example/android/motion/ui/demolist/DemoListFragment.kt
@@ -22,7 +22,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
 import androidx.recyclerview.widget.RecyclerView
 import com.example.android.motion.R
 import com.example.android.motion.ui.EdgeToEdge
diff --git a/Motion/app/src/main/java/com/example/android/motion/ui/demolist/DemoListViewModel.kt b/Motion/app/src/main/java/com/example/android/motion/ui/demolist/DemoListViewModel.kt
@@ -19,7 +19,6 @@ package com.example.android.motion.ui.demolist
 import android.app.Application
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Bundle
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
diff --git a/Motion/app/src/main/res/layout/nav_fade_through_activity.xml b/Motion/app/src/main/res/layout/nav_fade_through_activity.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-<fragment
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/nav_host"
diff --git a/Motion/app/src/main/res/layout/shared_element_activity.xml b/Motion/app/src/main/res/layout/shared_element_activity.xml
@@ -14,7 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
 -->
-<fragment
+<androidx.fragment.app.FragmentContainerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/nav_host"
diff --git a/Motion/build.gradle b/Motion/build.gradle
@@ -15,14 +15,14 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
-    ext.navigation_version = '2.2.2'
+    ext.kotlin_version = '1.4.10'
+    ext.navigation_version = '2.3.1'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
     }
diff --git a/Motion/gradle/wrapper/gradle-wrapper.properties b/Motion/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu May 28 14:24:57 JST 2020
+#Wed Oct 28 16:25:10 JST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
