Merge branch 'github/main' into main

Author: kokoro-team

PlayAssetDelivery/NativeSample/.gitignore

@@ -8,3 +8,4 @@
 /captures
 .externalNativeBuild
 common/ndkHelperBin
+play-core-native-sdk

PlayCoreKtx/app/build.gradle

@@ -102,7 +102,7 @@ configurations {
 }
 
 dependencies {
-    ktlint "com.pinterest:ktlint:0.35.0"
+    ktlint "com.pinterest:ktlint:0.36.0"
 }
 
 task ktlint(type: JavaExec, group: "cleanup") {

PlayCoreKtx/app/src/main/java/com/google/android/samples/dynamicfeatures/ui/MainFragment.kt

@@ -107,7 +107,7 @@ class MainFragment : Fragment(R.layout.fragment_main) {
                 installViewModel.invokePictureSelection()
             }
 
-            btnToggleLight.setOnClickListener { _ ->
+            btnToggleLight.setOnClickListener {
                 startModuleWhenReady = false
                 colorViewModel.lightsOn.value = !colorViewModel.lightsOn.value
             }

PlayCoreKtx/build.gradle

@@ -20,17 +20,17 @@ buildscript {
             'compileSdk'        : 30,
             'minSdk'            : 24,
             'targetSdk'         : 30,
-            'activity'          : '1.2.0-alpha07',
+            'activity'          : '1.2.0-alpha08',
             'annotations'       : '1.1.0',
-            'appcompat'         : '1.3.0-alpha01',
-            'constraintLayout'  : '1.1.3',
+            'appcompat'         : '1.3.0-alpha02',
+            'constraintLayout'  : '2.0.1',
             'coroutines'        : '1.3.9',
             'espresso'          : '3.1.1',
             'extJunit'          : '1.1.0',
-            'fragment'          : '1.3.0-alpha07',
+            'fragment'          : '1.3.0-alpha08',
             'kotlin'            : '1.4.0',
-            'lifecycle'         : '2.3.0-alpha06',
-            'material'          : '1.2.0-rc01',
+            'lifecycle'         : '2.3.0-alpha07',
+            'material'          : '1.2.0',
             'playcore'          : '1.8.0',
             'playcoreKtx'       : '1.8.1',
             'testRules'         : '1.1.1',
@@ -54,7 +54,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-rc01'
+        classpath 'com.android.tools.build:gradle:4.1.0-rc03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath("com.github.triplet.gradle:play-publisher:3.0.0-SNAPSHOT")
     }

PlayCoreKtx/buildSrc/build.gradle.kts

@@ -26,8 +26,8 @@ repositories {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle-api:4.1.0-rc01")
-    implementation("com.android.tools.build:gradle:4.1.0-rc01")
+    implementation("com.android.tools.build:gradle-api:4.1.0-rc03")
+    implementation("com.android.tools.build:gradle:4.1.0-rc03")
     implementation(kotlin("stdlib"))
     gradleApi()
 }

PlayCoreKtx/features/picture/src/main/java/com/google/android/samples/dynamicfeatures/ondemand/PaletteFragment.kt

@@ -28,7 +28,7 @@ import androidx.annotation.Keep
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
+import androidx.lifecycle.Observer
 import androidx.palette.graphics.Palette.Swatch
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -83,12 +83,12 @@ class PaletteFragment : Fragment(R.layout.palette) {
             adapter = instantiatePaletteAdapter()
         }
 
-        paletteViewModel.swatches.observe(viewLifecycleOwner) {
+        paletteViewModel.swatches.observe(viewLifecycleOwner, Observer {
             if (it.isEmpty()) {
                 Log.w(TAG, "Issue generating Palette, attempting to get new picture.")
                 getPicturePreview.launch(null)
             }
-        }
+        })
 
         super.onViewCreated(view, savedInstanceState)
     }
@@ -102,10 +102,10 @@ class PaletteFragment : Fragment(R.layout.palette) {
                 items = paletteViewModel.swatches.value!!
                 notifyDataSetChanged()
             }
-            paletteViewModel.swatches.observe(viewLifecycleOwner) { swatchList ->
-                items = swatchList
+            paletteViewModel.swatches.observe(viewLifecycleOwner, Observer {
+                items = it
                 notifyDataSetChanged()
-            }
+            })
         }
     }
 

PlayCoreKtx/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists