Skip to content

Commit

Permalink
[All] Update to Compose 1.0.1 (#620)
Browse files Browse the repository at this point in the history
  • Loading branch information
@manuelvicnt
manuelvicnt authored Aug 4, 2021
1 parent 24b62a1 commit 22eea87
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 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 @@ -34,12 +34,12 @@ object Libs {
}

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

object Kotlin {
private const val version = "1.5.10"
private const val version = "1.5.21"
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 @@ -53,14 +53,14 @@ object Libs {

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

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

object Compose {
const val snapshot = ""
const val version = "1.0.0"
const val version = "1.0.1"

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

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

const val gradlePlugin = "com.google.dagger:hilt-android-gradle-plugin:$version"
const val android = "com.google.dagger:hilt-android:$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 @@ -109,13 +109,13 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'androidx.activity:activity-ktx:1.2.3'
implementation 'androidx.core:core-ktx:1.6.0'
implementation "androidx.activity:activity-compose:1.3.0"
implementation "androidx.activity:activity-compose:1.3.1"

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-alpha05'
implementation 'androidx.navigation:navigation-compose:2.4.0-alpha06'

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
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*/

buildscript {
ext.kotlin_version = '1.5.10'
ext.compose_version = '1.0.0'
ext.kotlin_version = '1.5.21'
ext.compose_version = '1.0.1'
ext.coroutines_version = '1.5.0'
ext.accompanist_version = '0.15.0'
ext.accompanist_version = '0.16.0'

repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion Jetcaster/app/src/main/java/com/example/jetcaster/Graph.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ object Graph {

fun provide(context: Context) {
okHttpClient = OkHttpClient.Builder()
.cache(Cache(File(context.cacheDir, "http_cache"), 20 * 1024 * 1024))
.cache(Cache(File(context.cacheDir, "http_cache"), (20 * 1024 * 1024).toLong()))
.apply {
if (BuildConfig.DEBUG) eventListenerFactory(LoggingEventListener.Factory())
}
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 @@ -25,13 +25,13 @@ object Libs {
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"

object Accompanist {
const val version = "0.15.0"
const val version = "0.16.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.10"
private const val version = "1.5.21"
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 @@ -62,16 +62,16 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.6.0"

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

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

object Compose {
const val snapshot = ""
const val version = "1.0.0"
const val version = "1.0.1"

@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 @@ -29,12 +29,12 @@ object Libs {
const val material = "com.google.android.material:material:1.3.0"

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

object Kotlin {
private const val version = "1.5.10"
private const val version = "1.5.21"
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 @@ -52,12 +52,12 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.6.0"

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

object Compose {
const val snapshot = ""
const val version = "1.0.0"
const val version = "1.0.1"

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
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0"

object Accompanist {
const val version = "0.15.0"
const val version = "0.16.0"
const val insets = "com.google.accompanist:accompanist-insets:$version"
const val systemuicontroller = "com.google.accompanist:accompanist-systemuicontroller:$version"
}

object Kotlin {
private const val version = "1.5.10"
private const val version = "1.5.21"
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 @@ -48,7 +48,7 @@ object Libs {

object Compose {
const val snapshot = ""
const val version = "1.0.0"
const val version = "1.0.1"

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

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

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

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

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

object Test {
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 @@ -29,12 +29,12 @@ object Libs {
const val material = "com.google.android.material:material:1.3.0"

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

object Kotlin {
private const val version = "1.5.10"
private const val version = "1.5.21"
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 @@ -58,12 +58,12 @@ object Libs {
}

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

object Compose {
const val snapshot = ""
const val version = "1.0.0"
const val version = "1.0.1"

@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
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0"

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

object Kotlin {
private const val version = "1.5.10"
private const val version = "1.5.21"
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,15 +49,15 @@ object Libs {

object AndroidX {
const val coreKtx = "androidx.core:core-ktx:1.6.0"
const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha05"
const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha06"

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

object Compose {
const val snapshot = ""
const val version = "1.0.0"
const val version = "1.0.1"

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

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

object Test {
Expand Down

0 comments on commit 22eea87

Please sign in to comment.