From 6e5d88e3d13aec1c4bd60424e0e50b7c49dce1a2 Mon Sep 17 00:00:00 2001 From: "Z. Charles Dziura" Date: Wed, 21 Aug 2024 23:35:02 -0400 Subject: [PATCH] Give up on adding protocol buffer support --- app/app/build.gradle.kts | 23 +++++++------- app/gradle/libs.versions.toml | 58 ++++++++++++++++++----------------- 2 files changed, 42 insertions(+), 39 deletions(-) diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index 6b0f3c3..f35f657 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -12,7 +12,7 @@ android { defaultConfig { applicationId = "software.makeshift.debtpirate" minSdk = 33 - targetSdk = 34 + targetSdk = 35 versionCode = 1 versionName = "1.0" @@ -52,24 +52,25 @@ android { } dependencies { - implementation(libs.androidx.core.ktx) - implementation(libs.androidx.appcompat) - implementation(libs.material) - implementation(libs.material3) - implementation(libs.kotlinx.serialization) - implementation(libs.androidx.lifecycle.runtime.ktx) implementation(libs.androidx.activity.compose) - implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.appcompat) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.datastore) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.androidx.material.icons.extended) + implementation(libs.androidx.navigation.compose) implementation(libs.androidx.ui) implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) - implementation(libs.androidx.navigation.compose) - implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.kotlinx.serialization) implementation(libs.lifecycle.runtime.compose) - implementation(libs.androidx.material.icons.extended) implementation(libs.lifecycle.viewmodel.ktx) + implementation(libs.material) + implementation(libs.material3) implementation(libs.retrofit) implementation(libs.retrofit.gson) + implementation(platform(libs.androidx.compose.bom)) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml index 71d9502..7087d97 100644 --- a/app/gradle/libs.versions.toml +++ b/app/gradle/libs.versions.toml @@ -1,48 +1,50 @@ [versions] +activityCompose = "1.9.1" agp = "8.5.2" -kotlin = "2.0.10" +appcompat = "1.7.0" +composeBom = "2024.08.00" coreKtx = "1.13.1" +datastore = "1.1.1" +espressoCore = "3.6.1" +iconsExtended = "1.7.0-rc01" junit = "4.13.2" junitVersion = "1.2.1" -espressoCore = "3.6.1" -appcompat = "1.7.0" -material = "1.12.0" -material3 = "1.3.0-beta05" +kotlin = "2.0.10" kotlinxSerializationJson = "1.7.1" lifecycleRuntimeCompose = "2.8.4" -lifecycleViewmodelCompose = "2.8.4" lifecycleRuntimeKtx = "2.8.4" -activityCompose = "1.9.1" -composeBom = "2024.06.00" -navigation = "2.8.0-beta01" -iconsExtended = "1.7.0-beta07" lifecycleViewModelKtx = "2.8.4" +lifecycleViewmodelCompose = "2.8.4" +material = "1.12.0" +material3 = "1.3.0-rc01" +navigation = "2.8.0-rc01" retrofit = "2.9.0" [libraries] -androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } -junit = { group = "junit", name = "junit", version.ref = "junit" } -androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } -androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } -androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } -material = { group = "com.google.android.material", name = "material", version.ref = "material" } -material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" } -kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } -lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" } -androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" } -androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } -androidx-ui = { group = "androidx.compose.ui", name = "ui" } -androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } -androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } -androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } -androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } +androidx-datastore = { group = "androidx.datastore", name = "datastore", version.ref = "datastore" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" } +androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" } +androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } +androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycleViewmodelCompose" } +androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended-android", version.ref = "iconsExtended" } androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" } androidx-navigation-testing = { group = "androidx.navigation", name = "navigation-testing", version.ref = "navigation" } -androidx-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended-android", version.ref = "iconsExtended" } +androidx-ui = { group = "androidx.compose.ui", name = "ui" } +androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } +androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } +androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } +androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } +androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" } +lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeCompose" } lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewModelKtx" } +material = { group = "com.google.android.material", name = "material", version.ref = "material" } +material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" } retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } retrofit-gson = { group = "com.squareup.retrofit2", name = "converter-gson", version.ref = "retrofit" }