Skip to content

Commit

Permalink
dependency updates and minsdk bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Bartixxx32 committed Jan 7, 2025
1 parent a0be8aa commit cae29fe
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 12 deletions.
25 changes: 14 additions & 11 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
id("com.autonomousapps.dependency-analysis")
}

android {
Expand All @@ -10,10 +11,10 @@ android {

defaultConfig {
applicationId = "com.bartixxx.opflashcontrol"
minSdk = 29
minSdk = 31
targetSdk = 35
versionCode = 13
versionName = "1.1.0"
versionCode = 14
versionName = "1.1.1"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -29,6 +30,7 @@ android {
}
getByName("debug") {
multiDexEnabled = true
isJniDebuggable = true
}
}
compileOptions {
Expand Down Expand Up @@ -66,21 +68,22 @@ tasks.register("getVersion") {
dependencies {
implementation(libs.material)
implementation(libs.androidx.appcompat)
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
implementation(libs.androidx.activity)
implementation(libs.androidx.constraintlayout)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
androidTestImplementation(platform(libs.androidx.compose.bom))
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
debugRuntimeOnly(libs.androidx.ui.test.manifest)
implementation(libs.androidx.annotation)
implementation(libs.androidx.foundation)
implementation(libs.androidx.runtime)
implementation(libs.androidx.ui.text)
implementation(libs.androidx.ui.unit)
androidTestImplementation(libs.androidx.monitor)
androidTestImplementation(libs.junit)
implementation(libs.androidx.lifecycle.viewmodel)
}
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.compose) apply false
id("com.autonomousapps.dependency-analysis") version "2.6.1"
}
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
dependency.analysis.print.build.health=true
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. For more details, visit
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
Expand Down
15 changes: 14 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
[versions]
agp = "8.7.3"
annotation = "1.9.1"
appcompat = "1.7.0"
foundation = "1.7.6"
kotlin = "2.0.0"
coreKtx = "1.15.0"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"
lifecycleRuntimeKtx = "2.8.7"
activityCompose = "1.9.3"
composeBom = "2024.04.01"
composeBom = "2024.12.01"
material = "1.12.0"
activity = "1.9.3"
constraintlayout = "2.2.0"
monitor = "1.7.2"
runtime = "1.7.6"
uiText = "1.7.6"
uiUnit = "1.7.6"

[libraries]
androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" }
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycleRuntimeKtx" }
androidx-monitor = { module = "androidx.test:monitor", version.ref = "monitor" }
androidx-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "runtime" }
androidx-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "foundation" }
androidx-ui-unit = { module = "androidx.compose.ui:ui-unit", version.ref = "uiUnit" }
androidx-ui-text = { module = "androidx.compose.ui:ui-text", version.ref = "uiText" }
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" }
Expand Down

0 comments on commit cae29fe

Please sign in to comment.