Cleanup and organization.

This commit is contained in:
Luke Wass 2025-05-12 14:55:06 -05:00
parent 9e2c1531b2
commit d0d391da62
3 changed files with 33 additions and 85 deletions

View file

@ -83,78 +83,32 @@ android {
}
dependencies {
// implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation(libs.kotlin.stdlib.jdk7)
// implementation 'androidx.activity:activity-ktx:1.8.0'
implementation(libs.androidx.activity.ktx)
// implementation 'androidx.appcompat:appcompat:1.7.0'
implementation(libs.androidx.appcompat)
// implementation 'androidx.core:core-ktx:1.15.0'
implementation(libs.androidx.core.ktx)
// implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
implementation(libs.androidx.constraintlayout)
// implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation(libs.androidx.gridlayout)
// implementation 'androidx.palette:palette-ktx:1.0.0'
implementation(libs.androidx.palette.ktx)
// implementation 'androidx.recyclerview:recyclerview:1.4.0'
implementation(libs.androidx.recyclerview)
// implementation 'androidx.preference:preference-ktx:1.2.1'
implementation(libs.androidx.preference.ktx)
// implementation 'com.google.android.material:material:1.12.0'
implementation(libs.google.material)
// implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
implementation(libs.kotlinx.serialization.json)
// implementation "eu.jonahbauer:android-preference-annotations:1.1.2"
implementation(libs.jonahbauer.android.preference.annotations)
// implementation 'androidx.activity:activity:1.10.1'
implementation(libs.androidx.activity)
// annotationProcessor "eu.jonahbauer:android-preference-annotations:1.1.2"
// If you are using KSP, use ksp(...) instead of kapt(...) or annotationProcessor(...)
// Otherwise, if you still need kapt:
// kapt(libs.jonahbauer.android.preference.annotations)
// Or if you need annotationProcessor for Java libraries:
kapt(libs.jonahbauer.android.preference.annotations)
// testImplementation 'junit:junit:4.13.2'
testImplementation(libs.junit)
// androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation(libs.androidx.test.ext.junit)
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
androidTestImplementation(libs.androidx.espresso.core)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.activity.ktx)
implementation(libs.androidx.appcompat)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.gridlayout)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.material3)
implementation(libs.androidx.palette.ktx)
implementation(libs.androidx.preference.ktx)
implementation(libs.androidx.recyclerview)
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
implementation(libs.google.material)
implementation(libs.kotlinx.serialization.json)
implementation(libs.jonahbauer.android.preference.annotations)
kapt(libs.jonahbauer.android.preference.annotations)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.test.ext.junit)
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
debugImplementation(libs.androidx.ui.tooling)
}

View file

@ -15,8 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
# Android operating system, 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=false
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.nonTransitiveRClass=true

View file

@ -1,26 +1,26 @@
[versions]
activity = "1.10.1"
activity-ktx = "1.8.0"
activityCompose = "1.10.1"
agp = "8.10.0"
kotlin = "2.1.0"
kapt = "1.8.10"
serialization = "1.8.10"
android-preference-annotations = "1.1.2"
appcompat = "1.7.0"
composeBom = "2025.05.00"
constraintlayout = "2.2.0"
core-ktx = "1.15.0"
espresso-core = "3.6.1"
gridlayout = "1.0.0"
junit = "4.13.2"
junitVersion = "1.2.1"
espresso-core = "3.6.1"
lifecycleRuntimeKtx = "2.9.0"
activityCompose = "1.10.1"
composeBom = "2025.05.00"
appcompat = "1.7.0"
constraintlayout = "2.2.0"
gridlayout = "1.0.0"
recyclerview = "1.4.0"
material = "1.12.0"
android-preference-annotations = "1.1.2"
activity = "1.10.1"
kapt = "1.8.10"
kotlin = "2.1.0"
kotlinx-serialization-json = "1.7.3"
activity-ktx = "1.8.0"
core-ktx = "1.15.0"
lifecycleRuntimeKtx = "2.9.0"
material = "1.12.0"
palette-ktx = "1.0.0"
preference-ktx = "1.2.1"
recyclerview = "1.4.0"
serialization = "1.8.10"
[libraries]
# AndroidX dependencies
@ -48,14 +48,10 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
google-material = { group = "com.google.android.material", name = "material", version.ref = "material" }
# Kotlin and Serialization
kotlin-stdlib-jdk7 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk7", version.ref = "kotlin" } # Use kotlin version
kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
# Annotation Processors
jonahbauer-android-preference-annotations = { group = "eu.jonahbauer", name = "android-preference-annotations", version.ref = "android-preference-annotations" }
# The databinding library is bundled with the Android Gradle plugin. You do not need to declare a dependency on the library, but you must enable it in your module's build.gradle file.
# see https://developer.android.com/jetpack/androidx/releases/databinding
# android-databinding-compiler = { group = "com.android.databinding", name = "compiler", version.ref = "agp" } # Use agp version
# Testing dependencies
junit = { group = "junit", name = "junit", version.ref = "junit" }