Skip to content

Commit

Permalink
[All] Update to beta04.
Browse files Browse the repository at this point in the history 
Change-Id: I8edf7010dc712b4bc9c7ba83155a382fc6e213a3
  • Loading branch information
@nickbutcher
nickbutcher committed Apr 7, 2021
1 parent 303a17c commit a7486af
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 38 deletions.
10 changes: 5 additions & 5 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 @@ -30,7 +30,7 @@ object Libs {
}

object Accompanist {
private const val version = "0.7.1.compose-7262094-SNAPSHOT"
private const val version = "0.7.1"
const val coil = "com.google.accompanist:accompanist-coil:$version"
}

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

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

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

object Compose {
const val snapshot = "7262094"
private const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
private const val version = "1.0.0-beta04"

const val runtime = "androidx.compose.runtime:runtime:$version"
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
Expand All @@ -70,7 +70,7 @@ object Libs {

object Lifecycle {
private const val version = "2.3.1"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
}

Expand Down
4 changes: 2 additions & 2 deletions JetNews/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.3.0-rc01'
implementation 'androidx.activity:activity-ktx:1.2.2'
implementation 'androidx.core:core-ktx:1.6.0-alpha01'
implementation "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
implementation "androidx.activity:activity-compose:1.3.0-alpha06"

implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"

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

buildscript {
ext.kotlin_version = '1.4.32'
ext.compose_version = '1.0.0-SNAPSHOT'
ext.compose_version = '1.0.0-beta04'
ext.coroutines_version = '1.4.2'

repositories {
Expand All @@ -25,7 +25,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.0-alpha11'
classpath 'com.android.tools.build:gradle:7.0.0-alpha12'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -38,7 +38,6 @@ subprojects {
repositories {
google()
jcenter()
maven { url "https://androidx.dev/snapshots/builds/7249939/artifacts/repository/" }
}

apply plugin: 'com.diffplug.spotless'
Expand Down
10 changes: 5 additions & 5 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 @@ -27,7 +27,7 @@ object Libs {
const val material = "com.google.android.material:material:1.3.0"

object Accompanist {
private const val version = "0.7.1.compose-7262094-SNAPSHOT"
private const val version = "0.7.1"
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 @@ -65,16 +65,16 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01"

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

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

object Compose {
private const val snapshot = "7262094"
private const val version = "1.0.0-SNAPSHOT"
private const val snapshot = ""
private const val version = "1.0.0-beta04"

@get:JvmStatic
val snapshotUrl: String
Expand All @@ -93,7 +93,7 @@ object Libs {

object Lifecycle {
private const val version = "2.3.1"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
}

Expand Down
10 changes: 5 additions & 5 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 @@ -43,7 +43,7 @@ object Libs {
}

object Accompanist {
private const val version = "0.7.1.compose-7262094-SNAPSHOT"
private const val version = "0.7.1"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}

Expand All @@ -52,12 +52,12 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01"

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

object Compose {
const val snapshot = "7262094"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta04"

const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
Expand Down Expand Up @@ -96,7 +96,7 @@ object Libs {
const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
}
}
}
Expand Down
10 changes: 5 additions & 5 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.0.0-alpha12"

object Accompanist {
const val version = "0.7.1.compose-7262094-SNAPSHOT"
const val version = "0.7.1"
const val coil = "com.google.accompanist:accompanist-coil:$version"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}
Expand All @@ -47,8 +47,8 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01"

object Compose {
const val snapshot = "7262094"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta04"

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

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

object Lifecycle {
const val viewModelCompose =
"androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
"androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
}

object ConstraintLayout {
Expand Down
10 changes: 5 additions & 5 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 {
private const val version = "0.7.1.compose-7262094-SNAPSHOT"
private const val version = "0.7.1"
const val coil = "com.google.accompanist:accompanist-coil:$version"
}

Expand All @@ -53,17 +53,17 @@ object Libs {

object Lifecycle {
private const val version = "2.3.1"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-SNAPSHOT"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
}

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

object Compose {
const val snapshot = "7262094"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta04"

@get:JvmStatic
val snapshotUrl: String
Expand Down
10 changes: 5 additions & 5 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 @@ -24,7 +24,7 @@ object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha12"

object Accompanist {
const val version = "0.7.1.compose-7262094-SNAPSHOT"
const val version = "0.7.1"
const val coil = "com.google.accompanist:accompanist-coil:$version"
const val insets = "com.google.accompanist:accompanist-insets:$version"
}
Expand All @@ -50,11 +50,11 @@ object Libs {

object AndroidX {
const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01"
const val navigation = "androidx.navigation:navigation-compose:1.0.0-SNAPSHOT"
const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha10"

object Compose {
const val snapshot = "7262094"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta04"

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

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

object ConstraintLayout {
Expand Down
6 changes: 3 additions & 3 deletions Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.6.0-alpha01"

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

object Compose {
const val snapshot = "7262094"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta04"

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

0 comments on commit a7486af

Please sign in to comment.