From 87ab51822cd87ce07b8ea3ec9dcb8b93f04c0b2a Mon Sep 17 00:00:00 2001 From: Rebecca Franks Date: Mon, 6 Jun 2022 08:31:18 +0100 Subject: [PATCH] [All] Update to Compose 1.2.0-beta03 (#833) [All] Update to Compose 1.2.0-beta03 --- Crane/app/build.gradle | 4 ++-- .../samples/crane/calendar/Calendar.kt | 2 +- .../samples/crane/util/EasingFunctions.kt | 21 ------------------- Crane/build.gradle | 2 +- .../example/crane/buildsrc/Dependencies.kt | 4 ++-- JetNews/app/build.gradle | 2 +- JetNews/build.gradle | 6 +++--- Jetcaster/app/build.gradle | 4 ++-- Jetcaster/build.gradle | 2 +- .../jetcaster/buildsrc/dependencies.kt | 4 ++-- Jetchat/app/build.gradle | 4 ++-- Jetchat/build.gradle | 2 +- .../compose/jetchat/buildsrc/dependencies.kt | 2 +- Jetsnack/app/build.gradle | 4 ++-- Jetsnack/build.gradle | 2 +- .../example/jetsnack/buildsrc/Dependencies.kt | 4 ++-- Jetsurvey/app/build.gradle | 4 ++-- Jetsurvey/build.gradle | 2 +- .../jetsurvey/buildsrc/dependencies.kt | 4 ++-- Owl/app/build.gradle | 4 ++-- Owl/build.gradle | 2 +- .../com/example/owl/buildsrc/Dependencies.kt | 2 +- 22 files changed, 33 insertions(+), 54 deletions(-) delete mode 100644 Crane/app/src/main/java/androidx/compose/samples/crane/util/EasingFunctions.kt diff --git a/Crane/app/build.gradle b/Crane/app/build.gradle index 2c50115352..4227d9b6b1 100644 --- a/Crane/app/build.gradle +++ b/Crane/app/build.gradle @@ -35,11 +35,11 @@ String systemGoogleMapsKey = System.getenv("GOOGLE_MAPS_KEY") ?: "" String googleMapsKey = properties.getProperty("google.maps.key", systemGoogleMapsKey) android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId "androidx.compose.samples.crane" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 1 versionName "1.0" vectorDrawables.useSupportLibrary = true diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/calendar/Calendar.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/calendar/Calendar.kt index 16a6287cdb..a71c043eb6 100644 --- a/Crane/app/src/main/java/androidx/compose/samples/crane/calendar/Calendar.kt +++ b/Crane/app/src/main/java/androidx/compose/samples/crane/calendar/Calendar.kt @@ -17,6 +17,7 @@ package androidx.compose.samples.crane.calendar import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.EaseOutQuart import androidx.compose.animation.core.TweenSpec import androidx.compose.animation.core.tween import androidx.compose.foundation.layout.ExperimentalLayoutApi @@ -40,7 +41,6 @@ import androidx.compose.samples.crane.calendar.model.CalendarState import androidx.compose.samples.crane.calendar.model.CalendarUiState import androidx.compose.samples.crane.calendar.model.Month import androidx.compose.samples.crane.ui.CraneTheme -import androidx.compose.samples.crane.util.EaseOutQuart import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview diff --git a/Crane/app/src/main/java/androidx/compose/samples/crane/util/EasingFunctions.kt b/Crane/app/src/main/java/androidx/compose/samples/crane/util/EasingFunctions.kt deleted file mode 100644 index 14b984ec48..0000000000 --- a/Crane/app/src/main/java/androidx/compose/samples/crane/util/EasingFunctions.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2022 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package androidx.compose.samples.crane.util - -import androidx.compose.animation.core.CubicBezierEasing - -val EaseOutQuart = CubicBezierEasing(0.25f, 1f, 0.5f, 1f) diff --git a/Crane/build.gradle b/Crane/build.gradle index 31923387ea..1adfc3a37f 100644 --- a/Crane/build.gradle +++ b/Crane/build.gradle @@ -30,7 +30,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.5.2' + id 'com.diffplug.spotless' version '6.6.1' } subprojects { diff --git a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt index aa23071ea9..98a8594742 100644 --- a/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt +++ b/Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt @@ -57,11 +57,11 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-beta02" + const val version = "1.2.0-beta03" const val runtime = "androidx.compose.runtime:runtime:$version" const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version" - const val materialWindow = "androidx.compose.material3:material3-window-size-class:1.0.0-alpha10" + const val materialWindow = "androidx.compose.material3:material3-window-size-class:1.0.0-alpha12" const val material = "androidx.compose.material:material:$version" const val foundation = "androidx.compose.foundation:foundation:$version" diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle index ed973d9152..76aa577a9a 100644 --- a/JetNews/app/build.gradle +++ b/JetNews/app/build.gradle @@ -96,7 +96,7 @@ dependencies { implementation "androidx.compose.foundation:foundation-layout:$compose_version" implementation "androidx.compose.material:material:$compose_version" implementation "androidx.compose.material:material-icons-extended:$compose_version" - implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha10" + implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha12" implementation "androidx.compose.foundation:foundation:$compose_version" implementation "androidx.compose.animation:animation:$compose_version" implementation "androidx.compose.ui:ui-tooling-preview:$compose_version" diff --git a/JetNews/build.gradle b/JetNews/build.gradle index 6a59e80023..07308f1d84 100644 --- a/JetNews/build.gradle +++ b/JetNews/build.gradle @@ -16,10 +16,10 @@ buildscript { ext.kotlin_version = '1.6.21' - ext.compose_version = '1.2.0-beta02' + ext.compose_version = '1.2.0-beta03' ext.compose_snapshot_version = '' ext.coroutines_version = '1.6.0' - ext.accompanist_version = '0.24.9-beta' + ext.accompanist_version = '0.24.10-beta' repositories { google() @@ -33,7 +33,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.5.2' + id 'com.diffplug.spotless' version '6.6.1' } subprojects { diff --git a/Jetcaster/app/build.gradle b/Jetcaster/app/build.gradle index 2511b2d882..1feb986c84 100644 --- a/Jetcaster/app/build.gradle +++ b/Jetcaster/app/build.gradle @@ -28,12 +28,12 @@ kapt { } android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId 'com.example.jetcaster' minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 1 versionName '1.0' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/Jetcaster/build.gradle b/Jetcaster/build.gradle index 2ac034b580..e12723edf0 100644 --- a/Jetcaster/build.gradle +++ b/Jetcaster/build.gradle @@ -30,7 +30,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.5.2' + id 'com.diffplug.spotless' version '6.6.1' } subprojects { diff --git a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt index 2aca440bc4..f01c6f90f0 100644 --- a/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt +++ b/Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt @@ -25,7 +25,7 @@ object Libs { const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5" object Accompanist { - const val version = "0.24.9-beta" + const val version = "0.24.10-beta" const val pager = "com.google.accompanist:accompanist-pager:$version" } @@ -70,7 +70,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-beta02" + const val version = "1.2.0-beta03" @get:JvmStatic val snapshotUrl: String diff --git a/Jetchat/app/build.gradle b/Jetchat/app/build.gradle index a80ab638e7..679eda49af 100644 --- a/Jetchat/app/build.gradle +++ b/Jetchat/app/build.gradle @@ -22,12 +22,12 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId "com.example.compose.jetchat" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 1 versionName '1.0' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/Jetchat/build.gradle b/Jetchat/build.gradle index d4a1e52807..850d2a0e26 100644 --- a/Jetchat/build.gradle +++ b/Jetchat/build.gradle @@ -32,7 +32,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.5.2' + id 'com.diffplug.spotless' version '6.6.1' } subprojects { diff --git a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt index 87d3063d1d..64746087d4 100644 --- a/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt +++ b/Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt @@ -52,7 +52,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-beta02" + const val version = "1.2.0-beta03" const val foundation = "androidx.compose.foundation:foundation:$version" const val layout = "androidx.compose.foundation:foundation-layout:$version" diff --git a/Jetsnack/app/build.gradle b/Jetsnack/app/build.gradle index 21edc6c112..ded6d55058 100644 --- a/Jetsnack/app/build.gradle +++ b/Jetsnack/app/build.gradle @@ -23,12 +23,12 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId 'com.example.jetsnack' minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 1 versionName '1.0' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/Jetsnack/build.gradle b/Jetsnack/build.gradle index 8e6b6cdf36..28e87d2b0b 100644 --- a/Jetsnack/build.gradle +++ b/Jetsnack/build.gradle @@ -29,7 +29,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.5.2' + id 'com.diffplug.spotless' version '6.6.1' id 'com.android.test' version '7.2.0' apply false id 'org.jetbrains.kotlin.android' version '1.6.21' apply false } diff --git a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt index fd13a1e5e0..7adad1575d 100644 --- a/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt +++ b/Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt @@ -24,7 +24,7 @@ object Libs { const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0" object Accompanist { - const val version = "0.24.9-beta" + const val version = "0.24.10-beta" const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version" const val flowlayouts = "com.google.accompanist:accompanist-flowlayout:$version" } @@ -48,7 +48,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-beta02" + const val version = "1.2.0-beta03" const val foundation = "androidx.compose.foundation:foundation:${version}" const val layout = "androidx.compose.foundation:foundation-layout:${version}" diff --git a/Jetsurvey/app/build.gradle b/Jetsurvey/app/build.gradle index 4e37450b32..a67075f809 100644 --- a/Jetsurvey/app/build.gradle +++ b/Jetsurvey/app/build.gradle @@ -21,12 +21,12 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId "com.example.compose.jetsurvey" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 1 versionName "1.0" diff --git a/Jetsurvey/build.gradle b/Jetsurvey/build.gradle index 0c0d0fab8f..b8b179d19e 100644 --- a/Jetsurvey/build.gradle +++ b/Jetsurvey/build.gradle @@ -29,7 +29,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.5.2' + id 'com.diffplug.spotless' version '6.6.1' } subprojects { diff --git a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt index 0968cae0fb..82cc4c721e 100644 --- a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt +++ b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt @@ -27,7 +27,7 @@ object Libs { const val junit = "junit:junit:4.13.2" object Accompanist { - const val version = "0.24.9-beta" + const val version = "0.24.10-beta" const val permissions = "com.google.accompanist:accompanist-permissions:$version" } @@ -61,7 +61,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-beta02" + const val version = "1.2.0-beta03" @get:JvmStatic val snapshotUrl: String diff --git a/Owl/app/build.gradle b/Owl/app/build.gradle index 94da52e517..72dee66496 100644 --- a/Owl/app/build.gradle +++ b/Owl/app/build.gradle @@ -22,11 +22,11 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId 'com.example.owl' minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 1 versionName '1.0' vectorDrawables.useSupportLibrary true diff --git a/Owl/build.gradle b/Owl/build.gradle index 2ee6114c31..2ad41ec2aa 100644 --- a/Owl/build.gradle +++ b/Owl/build.gradle @@ -29,7 +29,7 @@ buildscript { } plugins { - id 'com.diffplug.spotless' version '6.5.2' + id 'com.diffplug.spotless' version '6.6.1' } subprojects { diff --git a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt index 4498f557ba..10ca99a518 100644 --- a/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt +++ b/Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt @@ -52,7 +52,7 @@ object Libs { object Compose { const val snapshot = "" - const val version = "1.2.0-beta02" + const val version = "1.2.0-beta03" const val animation = "androidx.compose.animation:animation:$version" const val foundation = "androidx.compose.foundation:foundation:$version"