Skip to content

[All] Update to Compose 1.0.0-rc01 #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 1, 2021
Merged

[All] Update to Compose 1.0.0-rc01 #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d5b9c6
[All] Update to Compose Snapshot 7489673.
nickbutcher Jun 25, 2021
8f2d34e
[Crane] Revert AGP 7.0.0-beta03 due to Hilt incompatibility.
nickbutcher Jun 28, 2021
e3057e7
[All] Update to Compose Snapshot 7506689.
nickbutcher Jun 30, 2021
e0026ba
[All] Update to Compose 1.0.0-rc01.
nickbutcher Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ object Versions {
}

object Libs {
// FIXME Hilt currently incompatible with AGP 7.0.0-beta04
// https://github.com/google/dagger/issues/2337
// https://github.com/google/dagger/issues/2700
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"

Expand All @@ -34,7 +37,7 @@ object Libs {
}

object Accompanist {
const val version = "0.12.0"
const val version = "0.13.0"
const val coil = "com.google.accompanist:accompanist-coil:$version"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}
Expand All @@ -54,14 +57,14 @@ object Libs {

object AndroidX {
object Activity {
const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
}

const val appcompat = "androidx.appcompat:appcompat:1.3.0"

object Compose {
const val snapshot = ""
const val version = "1.0.0-beta09"
const val version = "1.0.0-rc01"

const val runtime = "androidx.compose.runtime:runtime:$version"
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
Expand Down Expand Up @@ -92,7 +95,7 @@ object Libs {
}

object Hilt {
private const val version = "2.36"
private const val version = "2.37"

const val gradlePlugin = "com.google.dagger:hilt-android-gradle-plugin:$version"
const val android = "com.google.dagger:hilt-android:$version"
Expand Down
6 changes: 3 additions & 3 deletions JetNews/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.activity:activity-ktx:1.2.3'
implementation 'androidx.core:core-ktx:1.6.0-beta02'
implementation "androidx.activity:activity-compose:1.3.0-beta02"
implementation 'androidx.core:core-ktx:1.6.0-rc01'
implementation "androidx.activity:activity-compose:1.3.0-rc01"

implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"

implementation 'androidx.navigation:navigation-compose:2.4.0-alpha03'
implementation 'androidx.navigation:navigation-compose:2.4.0-alpha04'

androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test:runner:1.3.0'
Expand Down
6 changes: 3 additions & 3 deletions JetNews/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@

buildscript {
ext.kotlin_version = '1.5.10'
ext.compose_version = '1.0.0-beta09'
ext.compose_version = '1.0.0-rc01'
ext.coroutines_version = '1.4.2'
ext.accompanist_version = '0.12.0'
ext.accompanist_version = '0.13.0'

repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.0-beta03'
classpath 'com.android.tools.build:gradle:7.0.0-beta04'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
10 changes: 5 additions & 5 deletions Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt
View file
Open in desktop
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.0.0-beta03"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"

object Accompanist {
const val version = "0.12.0"
const val version = "0.13.0"
const val coil = "com.google.accompanist:accompanist-coil:$version"
const val insets = "com.google.accompanist:accompanist-insets:$version"
const val pager = "com.google.accompanist:accompanist-pager:$version"
Expand Down Expand Up @@ -60,10 +60,10 @@ object Libs {
const val appcompat = "androidx.appcompat:appcompat:1.2.0"
const val palette = "androidx.palette:palette:1.0.0"

const val coreKtx = "androidx.core:core-ktx:1.6.0-beta02"
const val coreKtx = "androidx.core:core-ktx:1.6.0-rc01"

object Activity {
const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
}

object Constraint {
Expand All @@ -72,7 +72,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.0-beta09"
const val version = "1.0.0-rc01"

@get:JvmStatic
val snapshotUrl: String
Expand Down
10 changes: 5 additions & 5 deletions Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"

const val junit = "junit:junit:4.13"

const val material = "com.google.android.material:material:1.3.0"

object Accompanist {
const val version = "0.12.0"
const val version = "0.13.0"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}

Expand All @@ -49,15 +49,15 @@ object Libs {

object AndroidX {
const val appcompat = "androidx.appcompat:appcompat:1.3.0"
const val coreKtx = "androidx.core:core-ktx:1.6.0-beta02"
const val coreKtx = "androidx.core:core-ktx:1.6.0-rc01"

object Activity {
const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
}

object Compose {
const val snapshot = ""
const val version = "1.0.0-beta09"
const val version = "1.0.0-rc01"

const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
Expand Down
12 changes: 6 additions & 6 deletions Jetsnack/buildSrc/src/main/java/com/example/jetsnack/buildsrc/Dependencies.kt
View file
Open in desktop
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.0-beta03"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"

object Accompanist {
const val version = "0.12.0"
const val version = "0.13.0"
const val coil = "com.google.accompanist:accompanist-coil:$version"
const val insets = "com.google.accompanist:accompanist-insets:$version"
const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
Expand All @@ -49,7 +49,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.0-beta09"
const val version = "1.0.0-rc01"

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

object Activity {
const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
}

object Lifecycle {
Expand All @@ -73,12 +73,12 @@ object Libs {
}

object Navigation {
const val navigationCompose = "androidx.navigation:navigation-compose:2.4.0-alpha03"
const val navigationCompose = "androidx.navigation:navigation-compose:2.4.0-alpha04"
}

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

object Test {
Expand Down
8 changes: 4 additions & 4 deletions Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"

const val junit = "junit:junit:4.13"

const val material = "com.google.android.material:material:1.3.0"

object Accompanist {
const val version = "0.12.0"
const val version = "0.13.0"
const val coil = "com.google.accompanist:accompanist-coil:$version"
const val permissions = "com.google.accompanist:accompanist-permissions:$version"
}
Expand Down Expand Up @@ -59,12 +59,12 @@ object Libs {
}

object Activity {
const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
}

object Compose {
const val snapshot = ""
const val version = "1.0.0-beta09"
const val version = "1.0.0-rc01"

@get:JvmStatic
val snapshotUrl: String
Expand Down
12 changes: 6 additions & 6 deletions Owl/buildSrc/src/main/java/com/example/owl/buildsrc/Dependencies.kt
View file
Open in desktop
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.0-beta03"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"

object Accompanist {
const val version = "0.12.0"
const val version = "0.13.0"
const val coil = "com.google.accompanist:accompanist-coil:$version"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}
Expand All @@ -49,16 +49,16 @@ object Libs {
}

object AndroidX {
const val coreKtx = "androidx.core:core-ktx:1.6.0-beta02"
const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha03"
const val coreKtx = "androidx.core:core-ktx:1.6.0-rc01"
const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha04"

object Activity {
const val activityCompose = "androidx.activity:activity-compose:1.3.0-beta02"
const val activityCompose = "androidx.activity:activity-compose:1.3.0-rc01"
}

object Compose {
const val snapshot = ""
const val version = "1.0.0-beta09"
const val version = "1.0.0-rc01"

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