Skip to content

[All] Update to beta01 #406

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
florina-muntenescu merged 1 commit into from
Feb 24, 2021
Merged

[All] Update to beta01 #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 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,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha06"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"

object GoogleMaps {
Expand All @@ -30,7 +30,7 @@ object Libs {
}

object Accompanist {
private const val version = "0.5.2.compose-7141639-SNAPSHOT"
private const val version = "0.6.0"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
}

Expand All @@ -49,12 +49,12 @@ 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-alpha03"
}

object Compose {
const val snapshot = "7141639"
private const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
private const val version = "1.0.0-beta01"

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

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

Expand Down
4 changes: 2 additions & 2 deletions JetNews/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.3.0-beta01'
implementation 'androidx.activity:activity-ktx:1.2.0'
implementation 'androidx.core:core-ktx:1.5.0-beta01'
implementation "androidx.activity:activity-compose:1.3.0-SNAPSHOT"
implementation "androidx.activity:activity-compose:1.3.0-alpha03"

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

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

buildscript {
ext.kotlin_version = '1.4.30'
ext.compose_version = '1.0.0-SNAPSHOT'
ext.compose_version = '1.0.0-beta01'
ext.coroutines_version = '1.4.2'

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

dependencies {
classpath 'com.android.tools.build:gradle:7.0.0-alpha06'
classpath 'com.android.tools.build:gradle:7.0.0-alpha08'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -36,10 +36,6 @@ plugins {

subprojects {
repositories {
maven {
def snapshot = "7141639"
url "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
}
google()
jcenter()
}
Expand Down
14 changes: 7 additions & 7 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,13 +21,13 @@ object Versions {
}

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

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

object Accompanist {
private const val version = "0.5.2.compose-7141639-SNAPSHOT"
private const val version = "0.6.0"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
}
Expand Down Expand Up @@ -64,16 +64,16 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01"

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

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

object Compose {
private const val snapshot = "7141639"
private const val version = "1.0.0-SNAPSHOT"
private const val snapshot = ""
private const val version = "1.0.0-beta01"

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

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

Expand Down
12 changes: 6 additions & 6 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,7 +21,7 @@ object Versions {
}

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

const val junit = "junit:junit:4.13"
Expand All @@ -43,7 +43,7 @@ object Libs {
}

object Accompanist {
private const val version = "0.5.2.compose-7154166-SNAPSHOT"
private const val version = "0.6.0"
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
}

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

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

object Compose {
const val snapshot = "7154166"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta01"

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-alpha02"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions Jetsnack/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ plugins {
subprojects {
repositories {
google()
mavenCentral()
jcenter()

if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
Expand Down
14 changes: 7 additions & 7 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-alpha06"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"

object Accompanist {
private const val version = "0.5.2.compose-7141639-SNAPSHOT"
private const val version = "0.6.0"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
}
Expand All @@ -47,8 +47,8 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01"

object Compose {
const val snapshot = "7141639"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta01"

const val foundation = "androidx.compose.foundation:foundation:${version}"
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
Expand All @@ -62,17 +62,17 @@ 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-alpha03"
}

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

object ConstraintLayout {
const val constraintLayoutCompose =
"androidx.constraintlayout:constraintlayout-compose:1.0.0-SNAPSHOT"
"androidx.constraintlayout:constraintlayout-compose:1.0.0-alpha03"
}
}
}
12 changes: 6 additions & 6 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-alpha06"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"
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.1.0"

object Accompanist {
private const val version = "0.5.2.compose-7154166-SNAPSHOT"
private const val version = "0.6.0"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
}

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

object Lifecycle {
private const val version = "2.3.0-beta01"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha01"
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha02"
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-alpha03"
}

object Compose {
const val snapshot = "7154166"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta01"

@get:JvmStatic
val snapshotUrl: String
Expand Down
14 changes: 7 additions & 7 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-alpha07"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"

object Accompanist {
private const val version = "0.5.2.compose-7154166-SNAPSHOT"
private const val version = "0.6.0"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
}
Expand All @@ -50,11 +50,11 @@ object Libs {

object AndroidX {
const val coreKtx = "androidx.core:core-ktx:1.5.0-beta01"
const val navigation = "androidx.navigation:navigation-compose:1.0.0-SNAPSHOT"
const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha08"

object Compose {
const val snapshot = "7154166"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta01"

const val animation = "androidx.compose.animation:animation:$version"
const val foundation = "androidx.compose.foundation:foundation:$version"
Expand All @@ -69,12 +69,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-alpha03"
}

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

object Test {
Expand Down
8 changes: 4 additions & 4 deletions Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt
View file
Open in desktop
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.0.0-alpha06"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha08"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"

const val material = "com.google.android.material:material:1.1.0"
Expand All @@ -45,12 +45,12 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"

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

object Compose {
const val snapshot = "7141639"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-beta01"

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