Skip to content

Commit

Permalink
[All] Update to Compose 1.2.0-beta03 (#833)
Browse files Browse the repository at this point in the history
[All] Update to Compose 1.2.0-beta03
  • Loading branch information
riggaroo authored Jun 6, 2022
1 parent 8f27ce0 commit 87ab518
Show file tree
Hide file tree
Showing 22 changed files with 33 additions and 54 deletions.
4 changes: 2 additions & 2 deletions Crane/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion Crane/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '6.5.2'
id 'com.diffplug.spotless' version '6.6.1'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions JetNews/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -33,7 +33,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '6.5.2'
id 'com.diffplug.spotless' version '6.6.1'
}

subprojects {
Expand Down
4 changes: 2 additions & 2 deletions Jetcaster/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Jetcaster/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '6.5.2'
id 'com.diffplug.spotless' version '6.6.1'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Jetchat/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Jetchat/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '6.5.2'
id 'com.diffplug.spotless' version '6.6.1'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions Jetsnack/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Jetsnack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand All @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions Jetsurvey/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion Jetsurvey/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '6.5.2'
id 'com.diffplug.spotless' version '6.6.1'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Owl/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Owl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '6.5.2'
id 'com.diffplug.spotless' version '6.6.1'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 87ab518

Please sign in to comment.