Skip to content

Commit

Permalink
Merge pull request #739 from android/dev-1.1
Browse files Browse the repository at this point in the history 
Update Compose to 1.1
  • Loading branch information
@bentrengrove
bentrengrove authored Feb 10, 2022
2 parents fabf608 + a3f3adf commit e840fb9
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Crane/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03
kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
}

packagingOptions {
Expand Down
4 changes: 2 additions & 2 deletions Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ object Libs {
}

object Accompanist {
const val version = "0.22.1-rc"
const val version = "0.23.0"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}

Expand All @@ -60,7 +60,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.1.0-rc03"
const val version = "1.1.0"

const val runtime = "androidx.compose.runtime:runtime:$version"
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03
kotlinCompilerExtensionVersion compose_version
}

packagingOptions {
Expand Down
2 changes: 0 additions & 2 deletions JetNews/app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<string name="cd_text_settings">Text settings</string>
<string name="cd_open_navigation_drawer">Open navigation drawer</string>
<string name="cd_more_actions">More actions</string>
<string name="cd_bookmark">Bookmark</string>
<string name="unbookmark">unbookmark</string>
<string name="bookmark">bookmark</string>
<string name="cd_search">Search</string>
Expand All @@ -42,7 +41,6 @@
<string name="home_search">Search articles</string>

<!-- Article Screen -->
<string name="article_published_in">Published in: %s</string>
<string name="article_functionality_not_available">Functionality not available \uD83D\uDE48</string>
<string name="article_share_post">Share post</string>
<string name="article_post_min_read">%1$s • %2$d min read</string>
Expand Down
4 changes: 2 additions & 2 deletions JetNews/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

buildscript {
ext.kotlin_version = '1.6.10'
ext.compose_version = '1.1.0-rc03'
ext.compose_version = '1.1.0'
ext.coroutines_version = '1.6.0'
ext.accompanist_version = '0.22.1-rc'
ext.accompanist_version = '0.23.0'

repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion Jetcaster/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
}
}

Expand Down
6 changes: 3 additions & 3 deletions Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt
View file
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.22.1-rc"
const val version = "0.23.0"
const val insets = "com.google.accompanist:accompanist-insets:$version"
const val pager = "com.google.accompanist:accompanist-pager:$version"
}
Expand Down Expand Up @@ -66,12 +66,12 @@ object Libs {
}

object Constraint {
const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.0-rc02"
const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.0"
}

object Compose {
const val snapshot = ""
const val version = "1.1.0-rc03"
const val version = "1.1.0"

@get:JvmStatic
val snapshotUrl: String
Expand Down
2 changes: 1 addition & 1 deletion Jetchat/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
}

packagingOptions {
Expand Down
6 changes: 3 additions & 3 deletions Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object Libs {
const val material3 = "com.google.android.material:material:1.5.0-rc01"

object Accompanist {
const val version = "0.22.1-rc"
const val version = "0.23.0"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}

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

object Compose {
const val snapshot = ""
const val version = "1.1.0-rc03"
const val version = "1.1.0"

const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
Expand All @@ -75,7 +75,7 @@ object Libs {

object Material3 {
const val snapshot = ""
const val version = "1.0.0-alpha02"
const val version = "1.0.0-alpha04"

const val material3 = "androidx.compose.material3:material3:$version"
}
Expand Down
2 changes: 1 addition & 1 deletion Jetsnack/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
}

packagingOptions {
Expand Down
6 changes: 3 additions & 3 deletions Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt
View file
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.1.0"

object Accompanist {
const val version = "0.22.1-rc"
const val version = "0.23.0"
const val insets = "com.google.accompanist:accompanist-insets:$version"
const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
const val flowlayouts = "com.google.accompanist:accompanist-flowlayout:$version"
Expand All @@ -49,7 +49,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.1.0-rc03"
const val version = "1.1.0"

const val foundation = "androidx.compose.foundation:foundation:${version}"
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
Expand Down Expand Up @@ -78,7 +78,7 @@ object Libs {

object ConstraintLayout {
const val constraintLayoutCompose =
"androidx.constraintlayout:constraintlayout-compose:1.0.0-rc02"
"androidx.constraintlayout:constraintlayout-compose:1.0.0"
}

object Test {
Expand Down
2 changes: 1 addition & 1 deletion Jetsurvey/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
}

packagingOptions {
Expand Down
4 changes: 2 additions & 2 deletions Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object Libs {
const val material = "com.google.android.material:material:1.3.0"

object Accompanist {
const val version = "0.22.1-rc"
const val version = "0.23.0"
const val permissions = "com.google.accompanist:accompanist-permissions:$version"
}

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

object Compose {
const val snapshot = ""
const val version = "1.1.0-rc03"
const val version = "1.1.0"

@get:JvmStatic
val snapshotUrl: String
Expand Down
2 changes: 1 addition & 1 deletion Owl/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion '1.1.0-rc02' // For Kotlin 1.6.10. Revert with rc03.
kotlinCompilerExtensionVersion Libs.AndroidX.Compose.version
}

packagingOptions {
Expand Down
8 changes: 4 additions & 4 deletions Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt
View file
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.0.3"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.1.0"

object Accompanist {
const val version = "0.22.1-rc"
const val version = "0.23.0"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}

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

object Compose {
const val snapshot = ""
const val version = "1.1.0-rc03"
const val version = "1.1.0"

const val animation = "androidx.compose.animation:animation:$version"
const val foundation = "androidx.compose.foundation:foundation:$version"
Expand All @@ -75,7 +75,7 @@ object Libs {

object ConstraintLayout {
const val constraintLayoutCompose =
"androidx.constraintlayout:constraintlayout-compose:1.0.0-rc02"
"androidx.constraintlayout:constraintlayout-compose:1.0.0"
}

object Test {
Expand Down

0 comments on commit e840fb9

Please sign in to comment.