80: Upgrade dependencies and switch to Compose snapshot r=msfjarvis a=msfjarvis

~~Kotlin 1.4.20 needs the Compose snapshot but some dependency resolution bullshit is breaking it 🤷~~

Dropped the Kotlin 1.4.20 bump, sticking with 1.4.10 until a Compose update is out.

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
bors[bot] 2020-11-29 16:29:05 +00:00 committed by GitHub
commit 8633908301
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 8 deletions

View file

@ -10,10 +10,6 @@ plugins {
`core-library-desugaring` `core-library-desugaring`
} }
repositories {
maven { setUrl("https://jitpack.io") }
}
val keystorePropertiesFile = rootProject.file("keystore.properties") val keystorePropertiesFile = rootProject.file("keystore.properties")
android { android {

View file

@ -1,6 +1,6 @@
rootProject.ext.versions = [ rootProject.ext.versions = [
agp: '4.2.0-alpha16', agp: '4.2.0-alpha16',
daggerHilt: '2.29.1-alpha', daggerHilt: '2.30.1-alpha',
kotlin: '1.4.10', kotlin: '1.4.10',
] ]

View file

@ -4,7 +4,7 @@
*/ */
private const val ANDROIDX_HILT_VERSION = "1.0.0-alpha02" private const val ANDROIDX_HILT_VERSION = "1.0.0-alpha02"
private const val DAGGER_HILT_VERSION = "2.29.1-alpha" private const val DAGGER_HILT_VERSION = "2.30.1-alpha"
object Dependencies { object Dependencies {
const val COMPOSE_VERSION = "1.0.0-alpha07" const val COMPOSE_VERSION = "1.0.0-alpha07"
@ -12,7 +12,7 @@ object Dependencies {
object Coroutines { object Coroutines {
private const val version = "1.4.1" private const val version = "1.4.2"
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
} }
@ -41,7 +41,7 @@ object Dependencies {
const val browser = "androidx.browser:browser:1.3.0-rc01" const val browser = "androidx.browser:browser:1.3.0-rc01"
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha05" const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha05"
const val coreLibraryDesugaring = "com.android.tools:desugar_jdk_libs:1.0.10" const val coreLibraryDesugaring = "com.android.tools:desugar_jdk_libs:1.0.10"
const val material = "com.google.android.material:material:1.3.0-alpha03" const val material = "com.google.android.material:material:1.3.0-alpha04"
object Compose { object Compose {