Skip to content

Commit

Permalink
Updated dependencies (#218)
Browse files Browse the repository at this point in the history
  • Loading branch information
kasem-sm authored Oct 6, 2022
1 parent 94454d5 commit 1fac236
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 35 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ dependencies {
//Destinations
implementation Destinations.core

implementation "com.google.android.material:material:1.7.0-alpha03"
implementation "com.google.android.material:material:1.8.0-alpha01"

implementation Hilt.navigation

Expand Down
23 changes: 11 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
kspVersion = '1.7.10-1.0.6'
kspVersion = '1.7.20-1.0.6'
}
repositories {
google()
Expand Down Expand Up @@ -29,7 +29,7 @@ task clean(type: Delete) {

def provideAndroidXWorkerDeps(project) {
project.dependencies {
implementation "androidx.work:work-runtime-ktx:2.8.0-alpha02"
implementation "androidx.work:work-runtime-ktx:2.8.0-beta01"
implementation "androidx.hilt:hilt-work:1.0.0"
kapt "androidx.hilt:hilt-compiler:1.0.0"
}
Expand All @@ -43,13 +43,12 @@ def provideHiltDeps(project) {
}
}

// Will later migrate to Ktor 2.0
def provideKtorAndroidDeps(project) {
project.dependencies {
implementation "io.ktor:ktor-client-android:2.0.3"
implementation "io.ktor:ktor-client-serialization:2.0.3"
implementation "io.ktor:ktor-client-content-negotiation:2.0.3"
implementation "io.ktor:ktor-serialization-kotlinx-json:2.0.3"
implementation "io.ktor:ktor-client-android:2.1.2"
implementation "io.ktor:ktor-client-serialization:2.1.2"
implementation "io.ktor:ktor-client-content-negotiation:2.1.2"
implementation "io.ktor:ktor-serialization-kotlinx-json:2.1.2"
}
}

Expand All @@ -58,19 +57,19 @@ def provideUnitTestDeps(project) {
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4")
testImplementation("com.google.truth:truth:1.1.3")
testImplementation("junit:junit:4.13.2")
testImplementation("app.cash.turbine:turbine:0.8.0")
testImplementation("io.mockk:mockk:1.12.5")
testImplementation("app.cash.turbine:turbine:0.11.0")
testImplementation("io.mockk:mockk:1.13.2")
}
}

def provideUiTestDeps(project) {
project.dependencies {
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.0-alpha02"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.3.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.2.0"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.2.1"
androidTestImplementation "com.google.truth:truth:1.1.3"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.0-alpha02"
debugImplementation "androidx.compose.ui:ui-test-manifest:1.3.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.26.0-alpha"
private const val accompanistVersion = "0.26.4-beta"
private const val prefix = "com.google.accompanist:accompanist"

const val sysUiController =
Expand Down
8 changes: 4 additions & 4 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.1"
const val gradle = "com.android.tools.build:gradle:$gradleVersion"

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

private const val roomVersion = "2.5.0-alpha02"
private const val roomVersion = "2.5.0-beta01"
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 @@ -14,9 +14,9 @@ object AndroidX {
private const val navigation = "2.5.0-alpha02"
const val navigationCommon = "androidx.navigation:navigation-common:$navigation"

private const val glanceVersion = "1.0.0-alpha03"
private const val glanceVersion = "1.0.0-alpha05"
const val glance = "androidx.glance:glance-appwidget:$glanceVersion"

private const val annotationVersion = "1.4.0"
private const val annotationVersion = "1.5.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 = 32
const val compileSkd = 33
const val minSdk = 24
const val targetSdk = 33
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Coil.kt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
object Coil {
private const val coilVersion = "2.1.0"
private const val coilVersion = "2.2.2"
const val core = "io.coil-kt:coil-compose-base:$coilVersion"
}
8 changes: 4 additions & 4 deletions buildSrc/src/main/java/Compose.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
object Compose {
private const val compostActivity = "1.6.0-alpha05"
private const val composeVersion = "1.3.0-alpha02"
private const val composeMaterial3Version = "1.0.0-alpha15"
const val composeCompiler = "1.3.0-rc01"
private const val compostActivity = "1.7.0-alpha01"
private const val composeVersion = "1.3.0-rc01"
private const val composeMaterial3Version = "1.0.0-rc01"
const val composeCompiler = "1.3.2"

const val ui = "androidx.compose.ui:ui:$composeVersion"
const val material = "androidx.compose.material:material:$composeVersion"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Destinations.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Destinations {
private const val destinationVersion = "1.7.15-beta"
private const val destinationVersion = "1.7.21-beta"
const val core = "io.github.raamcosta.compose-destinations:animations-core:$destinationVersion"
const val ksp = "io.github.raamcosta.compose-destinations:ksp:$destinationVersion"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Firebase.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ object Firebase {
private const val gmsVersion = "4.3.10"
const val gmsGoogleService = "com.google.gms:google-services:$gmsVersion"

private const val dynamicLinksVersion = "21.0.1"
private const val dynamicLinksVersion = "21.0.2"
const val dynamicLink = "com.google.firebase:firebase-dynamic-links-ktx:$dynamicLinksVersion"
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/Hilt.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
object Hilt {
private const val hiltVersion = "2.43.1"
private const val hiltVersion = "2.44"

const val gradle = "com.google.dagger:hilt-android-gradle-plugin:$hiltVersion"
const val library = "com.google.dagger:hilt-android:$hiltVersion"
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/src/main/java/Jetbrains.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
object Jetbrains {
private const val kotlin = "1.7.10"
private const val kotlin = "1.7.20"
private const val serializationGradleVersion = "1.6.0-RC2"
private const val serializationCoreVersion = "1.4.0-RC"
private const val serializationCoreVersion = "1.4.0"

const val gradle = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin"

Expand All @@ -15,7 +15,7 @@ object Jetbrains {
const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4"

// Ktor
private const val ktorVersion = "2.0.3"
private const val ktorVersion = "2.1.2"
const val ktorJvm = "io.ktor:ktor-http-jvm:$ktorVersion"
const val ktorUtils = "io.ktor:ktor-utils-jvm:$ktorVersion"
const val ktorClientCore = "io.ktor:ktor-client-core-jvm:$ktorVersion"
Expand Down
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.6.0-alpha01"
private const val version = "2.6.0-alpha02"

const val runtime = "androidx.lifecycle:lifecycle-runtime-ktx:$version"
const val viewModel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
Expand Down
4 changes: 2 additions & 2 deletions database/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.5.0-alpha04'
androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"
androidTestImplementation 'com.google.dagger:hilt-android-testing:2.43.1'
kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.43.1'
androidTestImplementation 'com.google.dagger:hilt-android-testing:2.44'
kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.43.2'
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@ class DailyReadWidget : GlanceAppWidget() {
}

class ActionUpdate : ActionCallback {
override suspend fun onRun(context: Context, glanceId: GlanceId, parameters: ActionParameters) {
override suspend fun onAction(
context: Context,
glanceId: GlanceId,
parameters: ActionParameters
) {
updateAppWidgetState(context, glanceId) { prefs ->
prefs[DailyReadWidget.articleTitlePreference] =
"Updated from Click ${Random.nextBits(100)}"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri May 13 09:55:33 IST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 1fac236

Please sign in to comment.