Merge branch 'main' into renovate/main-all

Author: JolandaVerhoef

AccessibilityCodelab/build.gradle

@@ -15,8 +15,8 @@
  */
 
 buildscript {
- ext.kotlin_version = '1.7.10'
- ext.composeCompiler_version = '1.3.0'
+ ext.kotlin_version = '1.7.20'
+ ext.composeCompiler_version = '1.3.2'
  ext.compose_version = '1.2.1'
  ext.coroutines_version = '1.6.4'
  ext.accompanist_version = '0.25.1'

AdaptiveUICodelab/build.gradle

@@ -16,8 +16,8 @@
 
 buildscript {
  ext {
- kotlin_version = '1.7.10'
- composeCompiler_version = '1.3.0'
+ kotlin_version = '1.7.20'
+ composeCompiler_version = '1.3.2'
  compose_version = '1.2.1'
  coroutines_version = '1.6.4'
  agp_version = "7.3.0"

AdvancedStateAndSideEffectsCodelab/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt

@@ -39,7 +39,7 @@ object Libs {
  }
 
  object Kotlin {
- private const val version = "1.7.10"
+ private const val version = "1.7.20"
  const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
  const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
  const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -59,7 +59,7 @@ object Libs {
  const val appcompat = "androidx.appcompat:appcompat:1.4.2"
 
  object Compose {
- const val compilerVersion = "1.3.0"
+ const val compilerVersion = "1.3.2"
  const val snapshot = ""
  const val version = "1.2.1"
 

AnimationCodelab/build.gradle

@@ -16,9 +16,9 @@
 
 buildscript {
  ext {
- composeCompiler_version = '1.3.0'
+ composeCompiler_version = '1.3.2'
  compose_version = '1.2.1'
- kotlin_version = '1.7.10'
+ kotlin_version = '1.7.20'
  }
  repositories {
  google()

BasicLayoutsCodelab/build.gradle

@@ -15,7 +15,7 @@
  */
 
 buildscript {
- ext.composeCompiler_version = '1.3.0'
+ ext.composeCompiler_version = '1.3.2'
  ext.compose_version = '1.2.1'
  repositories {
  google()

BasicStateCodelab/build.gradle

@@ -15,7 +15,7 @@
  */
 buildscript {
  ext {
- composeCompiler_version = '1.3.0'
+ composeCompiler_version = '1.3.2'
  compose_version = '1.2.1'
  }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.

BasicsCodelab/build.gradle

@@ -17,10 +17,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
  ext {
- composeCompiler_version = '1.3.0'
+ composeCompiler_version = '1.3.2'
  compose_version = '1.2.1'
  }
- ext.kotlin_version = "1.7.10"
+ ext.kotlin_version = "1.7.20"
  repositories {
  google()
  mavenCentral()

MigrationCodelab/build.gradle

@@ -24,7 +24,7 @@ buildscript {
 
  // App dependencies
  appCompatVersion = '1.4.2'
- composeCompilerVersion = '1.3.0'
+ composeCompilerVersion = '1.3.2'
  composeVersion = '1.2.1'
  constraintLayoutVersion = '2.1.4'
  coreTestingVersion = '2.1.0'
@@ -36,7 +36,7 @@ buildscript {
  gradleVersion = '7.3.0'
  gsonVersion = '2.9.0'
  junitVersion = '4.13.2'
- kotlinVersion = '1.7.10'
+ kotlinVersion = '1.7.20'
  ktlintVersion = '0.45.2'
  ktxVersion = '1.8.0'
  lifecycleVersion = '2.5.0'

NavigationCodelab/build.gradle

@@ -25,12 +25,12 @@ buildscript {
  // App dependencies
  appCompatVersion = '1.4.2'
  activityComposeVersion = '1.6.0-alpha03'
- composeCompilerVersion = "1.3.0"
+ composeCompilerVersion = "1.3.2"
  composeVersion = '1.2.1'
  coreTestingVersion = '2.1.0'
  espressoVersion = '3.4.0'
  gradleVersion = '7.3.0'
- kotlinVersion = '1.7.10'
+ kotlinVersion = '1.7.20'
  ktlintVersion = '0.45.2'
  ktxVersion = '1.8.0'
  materialVersion = '1.6.1'

TestingCodelab/build.gradle

@@ -25,15 +25,15 @@ buildscript {
  // App dependencies
  appCompatVersion = '1.4.2'
  activityComposeVersion = '1.4.0'
- composeCompilerVersion = '1.3.0'
+ composeCompilerVersion = '1.3.2'
  composeVersion = '1.2.1'
  coreTestingVersion = '2.1.0'
  coroutinesVersion = "1.5.2"
  espressoVersion = '3.4.0'
  fragmentVersion = '1.5.0'
  gradleVersion = '7.3.0'
  junitVersion = '4.13.1'
- kotlinVersion = '1.7.10'
+ kotlinVersion = '1.7.20'
  ktlintVersion = '0.45.2'
  ktxVersion = '1.8.0'
  lifecycleVersion = '2.3.0'