diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1782fd7..092b3fd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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 { @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3d8ce0c..23f1ea5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 796e6b2..1319c9d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2bc14ff..57d36ac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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