Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ plugins {
id("com.android.application")
kotlin("android")
kotlin("kapt")
alias(libs.plugins.hilt)
// alias(libs.plugins.hilt)
}

android {
namespace = "io.github.jbarr21.appdialer"
compileSdkVersion(33)
buildToolsVersion = "30.0.3"
defaultConfig {
Expand Down Expand Up @@ -53,10 +54,10 @@ android {
}

dependencies {
kapt(libs.androidx.room.apt)
kapt(libs.androidx.lifecycle.apt)
kapt(libs.dagger.hilt.apt.compiler)
kapt(libs.showkase.processor)
// kapt(libs.androidx.room.apt)
// kapt(libs.androidx.lifecycle.apt)
// kapt(libs.dagger.hilt.apt.compiler)
// kapt(libs.showkase.processor)

implementation(libs.androidx.activity.compose)
implementation(libs.androidx.appcompat)
Expand All @@ -75,7 +76,7 @@ dependencies {

implementation(libs.androidx.core)
implementation(libs.androidx.datastore)
implementation(libs.androidx.hilt.navCompose)
// implementation(libs.androidx.hilt.navCompose)

implementation(libs.androidx.lifecycle.extensions)
implementation(libs.androidx.lifecycle.runtimeKtx)
Expand All @@ -88,7 +89,7 @@ dependencies {
implementation(libs.androidx.room.runtime)

implementation(libs.coil.compose)
implementation(libs.dagger.hilt.android)
// implementation(libs.dagger.hilt.android)
implementation(libs.google.material)

implementation(libs.kotlin.coroutines)
Expand All @@ -99,7 +100,7 @@ dependencies {
implementation(libs.misc.timber)

implementation(libs.okhttp.core)
implementation(libs.showkase)
// implementation(libs.showkase)

debugImplementation(libs.misc.debug.flipper)
debugImplementation(libs.misc.debug.flipperNetwork)
Expand All @@ -108,7 +109,7 @@ dependencies {
testImplementation(libs.test.junit)
testImplementation(libs.test.truth)

androidTestImplementation(libs.test.android.espresso.core)
androidTestImplementation(libs.test.android.runner)
androidTestImplementation(libs.androidx.compose.uiTest)
// androidTestImplementation(libs.test.android.espresso.core)
// androidTestImplementation(libs.test.android.runner)
// androidTestImplementation(libs.androidx.compose.uiTest)
}
12 changes: 8 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# Gradle settings configured through the IDE *override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1536m
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# AndroidX package structure to make it clearer which packages are bundled with the
# OS, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

org.gradle.java.home = /usr/lib/jvm/java-17-openjdk-amd64
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
accompanist = "0.30.1"
agp = "7.4.2"
agp = "8.2.2"
androidTestSupport = "1.5.2"
coil = "1.4.0"
compose = "1.4.3"
composeCompiler = "1.4.6"
composeCompiler = "1.5.1"
composeMaterial3 = "1.1.1"
coroutines = "1.6.4"
dagger = "2.44"
coroutines = "1.7.3"
dagger = "2.48"
espresso = "3.5.1"
flipper = "0.79.1"
kotlin = "1.8.20"
ksp = "1.8.20-1.0.11"
kotlin = "2.0.0"
ksp = "2.0.0-1.0.21"
lifecycle = "2.6.1"
room = "2.5.1"
showkase = "1.0.0-beta18"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip