Skip to content

Commit

Permalink
Merge pull request android#683 from JoseAlcerreca/all_1.0.4
Browse files Browse the repository at this point in the history 
[All] Version bumps (Compose 1.0.4, Kotlin 1.5.31, Accompanist 0.20.0)
  • Loading branch information
@JoseAlcerreca
JoseAlcerreca authored Oct 15, 2021
2 parents d380475 + b56df3c commit 9ef65f7
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 27 deletions.
8 changes: 4 additions & 4 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 @@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"

object GoogleMaps {
Expand All @@ -34,12 +34,12 @@ object Libs {
}

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

object Kotlin {
private const val version = "1.5.30"
private const val version = "1.5.31"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand All @@ -60,7 +60,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.3"
const val version = "1.0.4"

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

buildscript {
ext.kotlin_version = '1.5.31'
ext.compose_version = '1.1.0-alpha05'
ext.compose_version = '1.1.0-alpha06'
ext.coroutines_version = '1.5.2'
ext.accompanist_version = '0.19.0'
ext.accompanist_version = '0.20.0'

repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.2'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
8 changes: 4 additions & 4 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 @@ -21,17 +21,17 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

object Accompanist {
const val version = "0.19.0"
const val version = "0.20.0"
const val insets = "com.google.accompanist:accompanist-insets:$version"
const val pager = "com.google.accompanist:accompanist-pager:$version"
}

object Kotlin {
private const val version = "1.5.30"
private const val version = "1.5.31"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand Down Expand Up @@ -71,7 +71,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.3"
const val version = "1.0.4"

@get:JvmStatic
val snapshotUrl: String
Expand Down
8 changes: 4 additions & 4 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 @@ -21,20 +21,20 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

const val junit = "junit:junit:4.13"

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

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

object Kotlin {
private const val version = "1.5.30"
private const val version = "1.5.31"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand All @@ -57,7 +57,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.3"
const val version = "1.0.4"

const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
Expand Down
8 changes: 4 additions & 4 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 @@ -21,17 +21,17 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"

object Accompanist {
const val version = "0.19.0"
const val version = "0.20.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"
}

object Kotlin {
private const val version = "1.5.30"
private const val version = "1.5.31"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand All @@ -49,7 +49,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.3"
const val version = "1.0.4"

const val foundation = "androidx.compose.foundation:foundation:${version}"
const val layout = "androidx.compose.foundation:foundation-layout:${version}"
Expand Down
8 changes: 4 additions & 4 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 @@ -21,20 +21,20 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

const val junit = "junit:junit:4.13"

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

object Accompanist {
const val version = "0.19.0"
const val version = "0.20.0"
const val permissions = "com.google.accompanist:accompanist-permissions:$version"
}

object Kotlin {
private const val version = "1.5.30"
private const val version = "1.5.31"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand Down Expand Up @@ -63,7 +63,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.3"
const val version = "1.0.4"

@get:JvmStatic
val snapshotUrl: String
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,15 +21,15 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.3"

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

object Kotlin {
private const val version = "1.5.30"
private const val version = "1.5.31"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand Down Expand Up @@ -57,7 +57,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.3"
const val version = "1.0.4"

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

0 comments on commit 9ef65f7

Please sign in to comment.