Skip to content

Commit

Permalink
Merge pull request android#332 from android/jv/alpha09
Browse files Browse the repository at this point in the history
[All] Update to alpha09
  • Loading branch information
JolandaVerhoef authored Dec 17, 2020
2 parents a0b19f4 + 96c0c6f commit f240e6e
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 26 deletions.
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.4.1.compose-7033025-SNAPSHOT"
private const val version = "0.4.1"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
}

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

object AndroidX {
object Compose {
const val snapshot = "7033025"
private const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
private const val version = "1.0.0-alpha09"

const val runtime = "androidx.compose.runtime:runtime:$version"
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
Expand Down
6 changes: 1 addition & 5 deletions JetNews/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

buildscript {
ext.kotlin_version = '1.4.21'
ext.compose_version = '1.0.0-SNAPSHOT'
ext.compose_version = '1.0.0-alpha09'
ext.coroutines_version = '1.4.2'

repositories {
Expand All @@ -36,10 +36,6 @@ plugins {

subprojects {
repositories {
maven {
def snapshot = "7033025"
url "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
}
google()
jcenter()
}
Expand Down
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.1.0"

object Accompanist {
private const val version = "0.4.1.compose-7033025-SNAPSHOT"
private const val version = "0.4.1"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
}
Expand Down Expand Up @@ -62,8 +62,8 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha04"

object Compose {
private const val snapshot = "7033025"
private const val version = "1.0.0-SNAPSHOT"
private const val snapshot = ""
private const val version = "1.0.0-alpha09"

@get:JvmStatic
val snapshotUrl: String
Expand Down
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.4.1.compose-7033025-SNAPSHOT"
private const val version = "0.4.1"
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
}

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

object Compose {
const val snapshot = "7033025"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-alpha09"

const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ object Libs {
const val junit = "junit:junit:4.13"

object Accompanist {
private const val version = "0.4.1.compose-7033025-SNAPSHOT"
private const val version = "0.4.1"
const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
}
Expand All @@ -48,8 +48,8 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha05"

object Compose {
const val snapshot = "7033025"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-alpha09"

const val foundation = "androidx.compose.foundation:foundation:${version}"
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
Expand Down
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.1.0"

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

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

object Compose {
const val snapshot = "7033025"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-alpha09"

@get:JvmStatic
val snapshotUrl: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ object Libs {
const val junit = "junit:junit:4.13"

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

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

object Compose {
const val snapshot = "7033025"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-alpha09"

const val animation = "androidx.compose.animation:animation:$version"
const val foundation = "androidx.compose.foundation:foundation:$version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"

object Compose {
const val snapshot = "7033025"
const val version = "1.0.0-SNAPSHOT"
const val snapshot = ""
const val version = "1.0.0-alpha09"

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

0 comments on commit f240e6e

Please sign in to comment.