Skip to content

Commit

Permalink
Updated Kotlin to 1.6.10 and updated other dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
chRyNaN committed Feb 26, 2022
1 parent ee60ba4 commit a2d59a6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.2")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
classpath("org.jetbrains.kotlin:kotlin-serialization:1.5.31")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.30")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
classpath("org.jetbrains.kotlin:kotlin-serialization:1.6.10")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
classpath("org.jetbrains.compose:compose-gradle-plugin:1.0.1")
}
}

Expand Down
4 changes: 2 additions & 2 deletions navigation-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ kotlin {
dependencies {
api(project(":navigation-core"))

implementation("com.chrynan.presentation:presentation-core:0.6.0")
implementation("com.chrynan.presentation:presentation-core:0.7.1")

implementation(compose.runtime)
}
Expand Down Expand Up @@ -100,7 +100,7 @@ android {
tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INHERIT }

dependencies {
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1")
}

afterEvaluate {
Expand Down
6 changes: 3 additions & 3 deletions navigation-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INHERIT }
// Android Specific Dependencies
dependencies {
implementation("androidx.activity:activity-ktx:1.4.0")
implementation("androidx.fragment:fragment-ktx:1.4.0")
implementation("androidx.fragment:fragment-ktx:1.4.1")
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.appcompat:appcompat:1.4.0")
implementation("androidx.appcompat:appcompat:1.4.1")

api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1")
}

afterEvaluate {
Expand Down
14 changes: 7 additions & 7 deletions sample-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,20 @@ tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INHERIT }

dependencies {
implementation("androidx.core:core-ktx:1.7.0")
implementation("androidx.appcompat:appcompat:1.4.0")
implementation("com.google.android.material:material:1.4.0")
implementation("androidx.appcompat:appcompat:1.4.1")
implementation("com.google.android.material:material:1.5.0")

implementation(compose.runtime)
implementation(compose.ui)
implementation(compose.material)

implementation("androidx.compose.compiler:compiler:1.1.0-rc02")
implementation("androidx.compose.ui:ui-tooling:1.1.0-rc01")
implementation("androidx.compose.compiler:compiler:1.2.0-alpha03")
implementation("androidx.compose.ui:ui-tooling:1.2.0-alpha03")
implementation("androidx.activity:activity-compose:1.4.0")
implementation("androidx.compose.material:material-icons-extended:1.1.0-rc01")
implementation("androidx.compose.material:material-icons-extended:1.2.0-alpha03")

implementation("com.chrynan.presentation:presentation-compose:0.6.0")
implementation("com.chrynan.colors:colors-compose:0.7.0")
implementation("com.chrynan.presentation:presentation-compose:0.7.1")
implementation("com.chrynan.colors:colors-compose:0.7.2")

implementation(project(":navigation-compose"))
}

0 comments on commit a2d59a6

Please sign in to comment.