Skip to content

Commit

Permalink
[All] Update to Compose 1.2.0 rc01 (#840)
Browse files Browse the repository at this point in the history
* [All] Update to 1.2.0 SNAPSHOT

* [All] Update to 1.2.0
  • Loading branch information
astamato authored Jun 17, 2022
1 parent 6c3a0af commit 9aea8cc
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Crane/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ buildscript {
}

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

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val secretsGradlePlugin = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
const val ktLint = "com.pinterest:ktlint:${Versions.ktlint}"

Expand Down Expand Up @@ -58,7 +58,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.2.0-beta03"
const val version = "1.2.0-rc01"

const val runtime = "androidx.compose.runtime:runtime:$version"
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
Expand Down
6 changes: 3 additions & 3 deletions 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-alpha12"
implementation "androidx.compose.material3:material3-window-size-class:1.0.0-alpha13"
implementation "androidx.compose.foundation:foundation:$compose_version"
implementation "androidx.compose.animation:animation:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
Expand All @@ -106,9 +106,9 @@ dependencies {
implementation "com.google.accompanist:accompanist-swiperefresh:$accompanist_version"
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"

implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.activity:activity-ktx:1.4.0'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.core:core-ktx:1.8.0'
implementation "androidx.activity:activity-compose:1.4.0"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"
Expand Down
8 changes: 4 additions & 4 deletions JetNews/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@

buildscript {
ext.kotlin_version = '1.6.21'
ext.compose_version = '1.2.0-beta03'
ext.compose_version = '1.2.0-rc01'
ext.compose_snapshot_version = ''
ext.coroutines_version = '1.6.0'
ext.accompanist_version = '0.24.10-beta'
ext.accompanist_version = '0.24.11-rc'

repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

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

subprojects {
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.6.1'
id 'com.diffplug.spotless' version '6.7.0'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

object Accompanist {
const val version = "0.24.10-beta"
const val version = "0.24.11-rc"
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-beta03"
const val version = "1.2.0-rc01"

@get:JvmStatic
val snapshotUrl: String
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.6.1'
id 'com.diffplug.spotless' version '6.7.0'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion Jetchat/buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

repositories {
jcenter()
mavenCentral()
}

plugins {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

const val junit = "junit:junit:4.13"
Expand Down Expand Up @@ -52,7 +52,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.2.0-beta03"
const val version = "1.2.0-rc01"

const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
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.6.1'
id 'com.diffplug.spotless' version '6.7.0'
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 @@ -21,10 +21,10 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"

object Accompanist {
const val version = "0.24.10-beta"
const val version = "0.24.11-rc"
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-beta03"
const val version = "1.2.0-rc01"

const val foundation = "androidx.compose.foundation:foundation:${version}"
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
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.6.1'
id 'com.diffplug.spotless' version '6.7.0'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

const val junit = "junit:junit:4.13.2"

object Accompanist {
const val version = "0.24.10-beta"
const val version = "0.24.11-rc"
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-beta03"
const val version = "1.2.0-rc01"

@get:JvmStatic
val snapshotUrl: String
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.6.1'
id 'com.diffplug.spotless' version '6.7.0'
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.0"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.2.1"

object Kotlin {
private const val version = "1.6.21"
Expand Down Expand Up @@ -52,7 +52,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.2.0-beta03"
const val version = "1.2.0-rc01"

const val animation = "androidx.compose.animation:animation:$version"
const val foundation = "androidx.compose.foundation:foundation:$version"
Expand Down

0 comments on commit 9aea8cc

Please sign in to comment.