Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
avidraghav committed May 25, 2024
1 parent 5e405a5 commit d3505f5
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 45 deletions.
11 changes: 5 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@ plugins {
alias(libs.plugins.ktlint)
id("spacedawn.android.hilt")
alias(libs.plugins.ksp)
alias(libs.plugins.compose.compiler)
}

android {
namespace = "com.raghav.spacedawnv2"
compileSdk = 34
compileSdk = libs.versions.compile.sdk.get().toInt()

defaultConfig {
applicationId = "com.raghav.spacedawnv2"
minSdk = 24
targetSdk = 34
minSdk = libs.versions.min.sdk.get().toInt()
targetSdk = libs.versions.target.sdk.get().toInt()
versionCode = 1
versionName = "1.0"

Expand Down Expand Up @@ -48,9 +49,7 @@ android {
compose = true
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.0"
}

packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/raghav/spacedawnv2/SDApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ class SDApp : Application(), Configuration.Provider {
@Inject
lateinit var workerFactory: HiltWorkerFactory

override fun getWorkManagerConfiguration() =
Configuration.Builder()
override val workManagerConfiguration: Configuration
get() = Configuration.Builder()
.setWorkerFactory(workerFactory)
.build()
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FilledIconButton
Expand Down Expand Up @@ -71,7 +71,7 @@ fun RemindersScreen(
)
) {
Icon(
imageVector = Icons.Default.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = stringResource(R.string.back_button)
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package com.raghav.spacedawnv2.util

import android.annotation.SuppressLint
import android.app.Activity
import android.app.Activity.RESULT_OK
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.provider.Settings
import androidx.activity.ComponentActivity
import androidx.activity.result.contract.ActivityResultContract

class ReminderPermissionContract : ActivityResultContract<String, Boolean>() {
Expand All @@ -19,6 +19,6 @@ class ReminderPermissionContract : ActivityResultContract<String, Boolean>() {
}

override fun parseResult(resultCode: Int, intent: Intent?): Boolean {
return resultCode == ComponentActivity.RESULT_OK
return resultCode == RESULT_OK
}
}
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ plugins {
alias(libs.plugins.ktlint) apply false
alias(libs.plugins.hilt) apply false
alias(libs.plugins.ksp) apply false
alias(libs.plugins.compose.compiler) apply false
}
7 changes: 4 additions & 3 deletions data/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ plugins {

android {
namespace = "com.raghav.data.spacedawnv2"
compileSdk = 34
compileSdk = libs.versions.compile.sdk.get().toInt()

defaultConfig {
minSdk = 24
targetSdk = 34
minSdk = libs.versions.min.sdk.get().toInt()
targetSdk = libs.versions.target.sdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
Expand Down Expand Up @@ -76,6 +76,7 @@ dependencies {
androidTestImplementation(libs.androidx.expresso.core)

testImplementation(libs.coroutines.test)
androidTestImplementation(libs.coroutines.test)

// For making Assertions in Test cases
testImplementation(libs.google.truth)
Expand Down
56 changes: 26 additions & 30 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
[versions]
# Project
android_compile_sdk = "34"
android_min_sdk = "24"
android_target_sdk = "34"
kotlin = "1.9.0"
compose_bom = "2023.08.00"
compile_sdk = "34"
min_sdk = "24"
target_sdk = "34"
kotlin = "2.0.0"
compose_bom = "2024.05.00"
android_gradle_plugin = "8.1.2"
ksp = "1.9.0-1.0.13"
ksp = "2.0.0-1.0.21"

# AndroidX
corektx = "1.8.0"
appcompat = "1.4.1"
corektx = "1.13.1"
appcompat = "1.6.1"
lifecycle_runtime = "2.3.1"

# Compose
compose = "1.5.0"
compose_nav = "2.7.0"
compose_activity = "1.5.1"
compose_nav = "2.7.7"
compose_activity = "1.9.0"

# Retrofit
retrofit = "2.9.0"
moshi = "1.14.0"
okhttp = "5.0.0-alpha.2"

# Coroutines
coroutines = "1.6.4"
coroutines = "1.8.0"

# Room
room = "2.5.1"
room = "2.6.1"

# Hilt
hilt = "2.47"
hilt_navigation = "1.0.0"
hilt_work = "1.0.0"
hilt_compiler = "1.0.0"
hilt = "2.49"
hilt_navigation = "1.2.0"
hilt_work = "1.2.0"
hilt_compiler = "1.2.0"

# Coil
coil = "2.4.0"
coil = "2.6.0"

# WorkManager
workmanager = "2.8.1"
workmanager = "2.9.0"

# Splash Screen
splashscreen_core = "1.0.1"
Expand All @@ -49,10 +48,9 @@ ktlint = "11.5.0"

# Test
test_junit = "4.13.2"
truth = "1.1.4"
androidx_test_extensions = "1.1.3"
androidx_test_core = "2.1.0"
material = "1.10.0"
truth = "1.4.2"
androidx_test_extensions = "1.1.5"
androidx_test_core = "2.2.0"

[libraries]
# Project
Expand All @@ -63,7 +61,7 @@ androidx_appcompat = { module = "androidx.appcompat:appcompat", version.ref = "a
androidx_lifecycle_runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle_runtime" }
androidx_activity_compose = { module = "androidx.activity:activity-compose", version.ref = "compose_activity" }

compose_bom = "androidx.compose:compose-bom:2023.10.00"
compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
compose_ui = { module = "androidx.compose.ui:ui" }
compose_graphics = { module = "androidx.compose.ui:ui-graphics" }
compose_tooling_preview = { module = "androidx.compose.ui:ui-tooling-preview" }
Expand All @@ -84,7 +82,6 @@ room_common = { module = "androidx.room:room-common", version.ref = "room" }
room_runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
room_compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
room_extensions = { module = "androidx.room:room-ktx", version.ref = "room" }
androidx_room_test = { module = "androidx.room:room-testing", version.ref = "room" }

# Hilt
hilt_android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
Expand All @@ -107,8 +104,8 @@ workmanager = { module = "androidx.work:work-runtime-ktx", version.ref = "workma
splashscreen_core = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen_core" }

# General dependencies
kotlin_immutable_collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.5" }
androidx_annotations = { module = "androidx.annotation:annotation", version = "1.6.0" }
kotlin_immutable_collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.7" }
androidx_annotations = { module = "androidx.annotation:annotation", version = "1.8.0" }
java_inject = { module = "javax.inject:javax.inject", version = "1" }

build_agp = { module = "com.android.tools.build:gradle", version.ref = "android_gradle_plugin" }
Expand All @@ -122,20 +119,19 @@ google_truth = { module = "com.google.truth:truth", version.ref = "truth" }
androidx_test_core = { module = "androidx.arch.core:core-testing", version.ref = "androidx_test_core" }
mockito_core = { module = "org.mockito:mockito-core", version = "5.3.1" }
mockito_kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version = "5.0.0" }
material = { group = "com.google.android.material", name = "material", version.ref = "material" }

[plugins]
android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }
kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlin_jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
kotlin_kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
android_library = { id = "com.android.library", version.ref = "android_gradle_plugin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

[bundles]
compose = ["compose-ui", "compose_graphics", "compose_tooling_preview", "material_3", "compose_lifecycle"]
compose = ["compose_ui", "compose_graphics", "compose_tooling_preview", "material_3", "compose_lifecycle"]
room = ["room_runtime", "room_extensions"]
retrofit = ["retrofit", "moshi", "retrofit_converter_moshi", "okhttp", "okhttp_interceptor"]
3 changes: 3 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ dependencyResolutionManagement {
}
}

/* https://github.com/gradle/gradle/issues/28407 */
gradle.startParameter.excludedTaskNames.addAll(listOf(":build-logic:convention:testClasses"))

rootProject.name = "SpaceDawn"
include(":app")
include(":domain")
Expand Down

0 comments on commit d3505f5

Please sign in to comment.