Skip to content

Commit

Permalink
Updated Compose and other deps (#163)
Browse files Browse the repository at this point in the history
Co-authored-by: kasem-sm <[email protected]>
  • Loading branch information
kasem-sm and kasem-sm authored Jun 18, 2022
1 parent 5153223 commit 5a3ea41
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 19 deletions.
6 changes: 3 additions & 3 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ val kmongoVersion: String by project

plugins {
application
kotlin("jvm") version "1.6.0"
id("org.jetbrains.kotlin.plugin.serialization") version "1.6.0"
kotlin("jvm") version "1.7.0"
id("org.jetbrains.kotlin.plugin.serialization") version "1.7.0"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("com.diffplug.spotless") version "6.3.0"
id("com.diffplug.spotless") version "6.7.2"
}

group = "slime.com"
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ def provideUnitTestDeps(project) {

def provideUiTestDeps(project) {
project.dependencies {
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.2.0-beta02"
androidTestImplementation "androidx.test.ext:junit:1.1.4-alpha06"
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.0-alpha06"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.2.0-rc01"
androidTestImplementation "androidx.test.ext:junit:1.1.4-alpha07"
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.0-alpha07"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.1.1"
androidTestImplementation "com.google.truth:truth:1.1.3"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.2.0-beta02"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.2.0-rc01"
}
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Accompanist.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Accompanist {
private const val accompanistVersion = "0.24.9-beta"
private const val accompanistVersion = "0.24.11-rc"
private const val prefix = "com.google.accompanist:accompanist"

const val navigationAnimation =
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/java/AndroidX.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ object AndroidX {
private const val gradleVersion = "7.2.0"
const val gradle = "com.android.tools.build:gradle:$gradleVersion"

private const val coreVersion = "1.9.0-alpha04"
private const val coreVersion = "1.9.0-alpha05"
const val core = "androidx.core:core-ktx:$coreVersion"

private const val roomVersion = "2.5.0-alpha01"
private const val roomVersion = "2.5.0-alpha02"
const val room = "androidx.room:room-ktx:$roomVersion"
const val roomRuntime = "androidx.room:room-runtime:$roomVersion"
const val roomCompiler = "androidx.room:room-compiler:$roomVersion"
Expand All @@ -17,6 +17,6 @@ object AndroidX {
private const val glanceVersion = "1.0.0-alpha03"
const val glance = "androidx.glance:glance-appwidget:$glanceVersion"

private const val annotationVersion = "1.4.0-beta01"
private const val annotationVersion = "1.4.0"
const val annotation = "androidx.annotation:annotation:$annotationVersion"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/App.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
object App {
const val applicationId = "kasem.sm.slime"

const val compileSkd = 31
const val compileSkd = 32
const val minSdk = 24
const val targetSdk = 33
}
9 changes: 5 additions & 4 deletions buildSrc/src/main/java/Compose.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
object Compose {
private const val compostActivity = "1.6.0-alpha03"
private const val compostActivity = "1.6.0-alpha05"
private const val compostNavigation = "2.5.0-alpha01"
private const val composeVersion = "1.2.0-beta02"
private const val composeMaterial3Version = "1.0.0-alpha12"
const val composeCompiler = "1.2.0-beta02"
private const val composeVersion = "1.2.0-rc01"
private const val composeMaterial3Version = "1.0.0-alpha13"
const val composeCompiler = "1.2.0-rc01"

const val ui = "androidx.compose.ui:ui:$composeVersion"
const val material = "androidx.compose.material:material:$composeVersion"
Expand All @@ -12,4 +12,5 @@ object Compose {
const val activity = "androidx.activity:activity-compose:$compostActivity"
const val iconsExtended = "androidx.compose.material:material-icons-extended:$composeVersion"
const val tooling = "androidx.compose.ui:ui-tooling-preview:$composeVersion"
const val ui_tooling = "androidx.compose.ui:ui-tooling:$composeVersion"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Lifecycle.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Lifecycle {
private const val version = "2.5.0-rc01"
private const val version = "2.5.0-rc02"

const val runtime = "androidx.lifecycle:lifecycle-runtime-ktx:$version"
const val viewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
Expand Down
2 changes: 1 addition & 1 deletion features/article/markdown/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ apply {
}

dependencies {
implementation("org.commonmark:commonmark:0.18.2")
implementation("org.commonmark:commonmark:0.19.0")
implementation(Compose.material3)
}
2 changes: 1 addition & 1 deletion gradle/ui.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ dependencies {
implementation Lifecycle.viewModel

debugImplementation Compose.tooling
debugImplementation "androidx.compose.ui:ui-tooling:1.2.0-beta02"
debugImplementation Compose.ui_tooling
}

0 comments on commit 5a3ea41

Please sign in to comment.