Skip to content

Commit

Permalink
update to Jetpack Compose 1.0.2 and related updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joreilly committed Sep 3, 2021
1 parent 3e57b07 commit 7736f85
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:exported="true"
android:theme="@style/Theme.BikeShare.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.0.0")
classpath("com.android.tools.build:gradle:7.0.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}")
}
Expand Down
10 changes: 3 additions & 7 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ object Versions {
const val ktor = "1.6.2"
const val kotlinxSerialization = "1.2.2"
const val koin = "3.1.2"
const val ktx = "1.0.1"
const val lifecycle = "2.2.0-alpha01"
const val compose = "1.0.1"
const val nav_compose = "2.4.0-alpha06"
const val accompanist = "0.16.0"
const val compose = "1.0.2"
const val nav_compose = "2.4.0-alpha08"
const val slf4j = "1.7.30"

const val kermit = "0.1.8"
Expand All @@ -20,7 +18,7 @@ object Versions {

object AndroidSdk {
const val min = 21
const val compile = 30
const val compile = 31
const val target = compile
}

Expand Down Expand Up @@ -65,7 +63,5 @@ object Ktor {
val clientApache = "io.ktor:ktor-client-apache:${Versions.ktor}"
val slf4j = "org.slf4j:slf4j-simple:${Versions.slf4j}"
val clientIos = "io.ktor:ktor-client-ios:${Versions.ktor}"
val clientCio = "io.ktor:ktor-client-cio:${Versions.ktor}"
val clientJs = "io.ktor:ktor-client-js:${Versions.ktor}"
}

0 comments on commit 7736f85

Please sign in to comment.