Skip to content

Commit

Permalink
Refactored gradle files
Browse files Browse the repository at this point in the history
  • Loading branch information
torland-klev committed Oct 21, 2024
1 parent 214397a commit 228a67d
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 51 deletions.
50 changes: 25 additions & 25 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.compose") version "2.0.21"
kotlin("plugin.serialization") version "2.0.21"
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.compose)
alias(libs.plugins.serialization)
}

android {
namespace = "com.pax.ecr.app"
compileSdk = 34
compileSdk = 35

defaultConfig {
applicationId = "com.pax.ecr.app"
minSdk = 27
//noinspection ExpiredTargetSdkVersion App will not be published to Google Play
targetSdk = 28
versionCode = 1
versionName = "1.0"

Expand Down Expand Up @@ -51,27 +53,25 @@ android {
}

dependencies {
// Debug Dependencies
debugImplementation(libs.androidx.ui.test.manifest)
debugImplementation(libs.androidx.ui.tooling)

androidTestImplementation("androidx.compose.ui:ui-test-junit4")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.03"))
// Main Implementation Dependencies
implementation(libs.androidx.activity.compose)
implementation(libs.androidx.material3)
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.material.icons)
implementation(platform(libs.androidx.compose.bom.main))

debugImplementation("androidx.compose.ui:ui-test-manifest")
debugImplementation("androidx.compose.ui:ui-tooling")
// Kotlin Serialization
implementation(libs.kotlinx.serialization.json)

implementation("androidx.activity:activity-compose:1.9.2")
implementation("androidx.compose.material3:material3")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
implementation(platform("androidx.compose:compose-bom:2024.09.03"))

implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")

testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.1")
testImplementation("junit:junit:4.13.2")
// Test Dependencies
testImplementation(libs.assertk.jvm)
testImplementation(libs.junit)
}

This file was deleted.

6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

plugins {
id("com.android.application") version "8.7.1" apply false
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.ktlint)
}

subprojects {
Expand Down
42 changes: 42 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[versions]
junit = "4.13.2"
assertk = "0.28.1"
activity_compose = "1.9.3"
material3 = "latest.release"
compose_bom = "2024.10.00"
core_ktx = "1.13.1"
lifecycle_ktx = "2.8.6"
serialization_json = "1.7.3"
agp = "8.7.1"
kotlin = "2.0.21"
ktlint = "12.1.1"
material_icons = "1.7.4"

[libraries]

# Debug Dependencies
androidx_ui_test_manifest = { module = "androidx.compose.ui:ui-test-manifest" }
androidx_ui_tooling = { module = "androidx.compose.ui:ui-tooling" }

# Main Implementation Dependencies
androidx_activity_compose = { module = "androidx.activity:activity-compose", version.ref = "activity_compose" }
androidx_material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
androidx_ui = { module = "androidx.compose.ui:ui" }
androidx_ui_graphics = { module = "androidx.compose.ui:ui-graphics" }
androidx_ui_tooling_preview = { module = "androidx.compose.ui:ui-tooling-preview" }
androidx_core_ktx = { module = "androidx.core:core-ktx", version.ref = "core_ktx" }
androidx_lifecycle_runtime_ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle_ktx" }
androidx_compose_bom_main = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
kotlinx_serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization_json" }
androidx_material_icons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "material_icons" }

# Test Dependencies
assertk_jvm = { module = "com.willowtreeapps.assertk:assertk-jvm", version.ref = "assertk" }
junit = { module = "junit:junit", version.ref = "junit" }

[plugins]
android_application = { id = "com.android.application", version.ref = "agp" }
kotlin_android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

0 comments on commit 228a67d

Please sign in to comment.