Updated Kotlin to version 1.7.0 and updated other dependencies

chRyNaN · Aug 20, 2022 · 89f01a8 · 89f01a8
1 parent e8d8a03
commit 89f01a8
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 23 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,10 +12,10 @@ buildscript {
  }
  dependencies {
  classpath("com.android.tools.build:gradle:4.2.2")
- 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")
+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
+ classpath("org.jetbrains.kotlin:kotlin-serialization:1.7.0")
+ classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.0")
+ classpath("org.jetbrains.compose:compose-gradle-plugin:1.2.0-alpha01-dev755")
  }
 }
 

diff --git a/buildSrc/src/main/java/com.chrynan.navigation.buildSrc/LibraryConstants.kt b/buildSrc/src/main/java/com.chrynan.navigation.buildSrc/LibraryConstants.kt
@@ -15,8 +15,8 @@ object LibraryConstants {
 
  object Android {
 
- const val compileSdkVersion = 31
+ const val compileSdkVersion = 33
  const val minSdkVersion = 25
- const val targetSdkVersion = 31
+ const val targetSdkVersion = 33
  }
 }
diff --git a/navigation-compose/build.gradle.kts b/navigation-compose/build.gradle.kts
@@ -33,8 +33,6 @@ kotlin {
  dependencies {
  api(project(":navigation-core"))
 
- implementation("com.chrynan.presentation:presentation-core:0.7.1")
-
  implementation(compose.runtime)
  }
  }
@@ -48,7 +46,7 @@ kotlin {
  dependencies {
  implementation(compose.ui)
  implementation(compose.material)
- implementation("androidx.activity:activity-compose:1.4.0")
+ implementation("androidx.activity:activity-compose:1.5.1")
  }
  }
  val jsMain by getting {
@@ -100,7 +98,7 @@ android {
 tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INHERIT }
 
 dependencies {
- implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1")
+ implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
 }
 
 afterEvaluate {

diff --git a/navigation-core/build.gradle.kts b/navigation-core/build.gradle.kts
@@ -34,7 +34,7 @@ kotlin {
  dependencies {
  implementation("org.jetbrains.kotlin:kotlin-stdlib-common")
 
- implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
+ api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
  }
  }
  val iosMain by sourceSets.getting
@@ -85,12 +85,12 @@ tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INHERIT }
 
 // Android Specific Dependencies
 dependencies {
- implementation("androidx.activity:activity-ktx:1.5.0")
- implementation("androidx.fragment:fragment-ktx:1.5.0")
+ implementation("androidx.activity:activity-ktx:1.5.1")
+ implementation("androidx.fragment:fragment-ktx:1.5.2")
  implementation("androidx.core:core-ktx:1.8.0")
- implementation("androidx.appcompat:appcompat:1.4.2")
+ implementation("androidx.appcompat:appcompat:1.5.0")
 
- api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0")
+ api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
 }
 
 afterEvaluate {

diff --git a/sample-compose/build.gradle.kts b/sample-compose/build.gradle.kts
@@ -11,7 +11,7 @@ group = LibraryConstants.group
 version = LibraryConstants.versionName
 
 android {
- compileSdk = 31
+ compileSdk = 33
  buildToolsVersion = "30.0.3"
 
  defaultConfig {
@@ -49,18 +49,18 @@ android {
 tasks.withType<Jar> { duplicatesStrategy = DuplicatesStrategy.INHERIT }
 
 dependencies {
- implementation("androidx.core:core-ktx:1.7.0")
- implementation("androidx.appcompat:appcompat:1.4.1")
- implementation("com.google.android.material:material:1.5.0")
+ implementation("androidx.core:core-ktx:1.8.0")
+ implementation("androidx.appcompat:appcompat:1.5.0")
+ implementation("com.google.android.material:material:1.6.1")
 
  implementation(compose.runtime)
  implementation(compose.ui)
  implementation(compose.material)
 
- 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.2.0-alpha03")
+ implementation("androidx.compose.compiler:compiler:1.3.0")
+ implementation("androidx.compose.ui:ui-tooling:1.3.0-alpha03")
+ implementation("androidx.activity:activity-compose:1.5.1")
+ implementation("androidx.compose.material:material-icons-extended:1.3.0-alpha03")
 
  implementation("com.chrynan.presentation:presentation-compose:0.7.1")
  implementation("com.chrynan.colors:colors-compose:0.7.2")