diff --git a/app/build.gradle b/app/build.gradle index c9e994b..4497983 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdk 35 + compileSdk 36 defaultConfig { applicationId "com.telefonica.androidlogger.app" minSdkVersion 21 - targetSdkVersion 35 + targetSdkVersion 36 versionCode 1 versionName "1.0.0" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9266e8d..89158d5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,17 +1,17 @@ [versions] activity = "1.10.1" -android-gradle-plugin = "8.7.3" +android-gradle-plugin = "8.11.1" junit = "4.13.2" -kotlin = "2.0.21" +kotlin = "2.1.20" androidx-lifecycle = "2.2.0" material = "1.12.0" elviswhew-xlog = "1.11.1" -okio = "3.9.1" +okio = "3.16.0" [libraries] androidx-activity = { module = "androidx.activity:activity", version.ref = "activity" } androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" } -androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" } +androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" } androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "androidx-lifecycle" } com-google-android-material = { module = "com.google.android.material:material", version.ref = "material" } com-squareup-okio = { module = "com.squareup.okio:okio", version.ref = "okio" } @@ -23,5 +23,5 @@ elvishew-xlog = { module = "com.elvishew:xlog", version.ref = "elviswhew-xlog" } com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" } com-android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -gitlab-arturbosch-detekt = "io.gitlab.arturbosch.detekt:1.23.7" +gitlab-arturbosch-detekt = "io.gitlab.arturbosch.detekt:1.23.8" github-gradle-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..37f853b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index 7a161bd..f39b12d 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -4,11 +4,11 @@ plugins{ } android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdkVersion 21 - targetSdkVersion 35 + targetSdkVersion 36 } flavorDimensions "loggerMode" diff --git a/library/src/enabled/java/com/telefonica/androidlogger/ui/viewmodel/AppLoggerViewModels.kt b/library/src/enabled/java/com/telefonica/androidlogger/ui/viewmodel/AppLoggerViewModels.kt index 205c8e0..e84e5d2 100644 --- a/library/src/enabled/java/com/telefonica/androidlogger/ui/viewmodel/AppLoggerViewModels.kt +++ b/library/src/enabled/java/com/telefonica/androidlogger/ui/viewmodel/AppLoggerViewModels.kt @@ -18,6 +18,7 @@ import com.telefonica.androidlogger.ui.livedata.map import com.telefonica.androidlogger.ui.livedata.throttle import java.text.SimpleDateFormat import java.util.* +import androidx.core.graphics.toColorInt internal class AppLoggerViewModel : ViewModel() { @@ -168,10 +169,10 @@ internal enum class LogPriorityViewModel( val displayName: String, @ColorInt val color: Int ) { - VERBOSE("Verbose", Color.parseColor("#6C757D")), - DEBUG("Debug", Color.parseColor("#000000")), - INFO("Info", Color.parseColor("#007BFF")), - WARN("Warn", Color.parseColor("#FFC107")), - ERROR("Error", Color.parseColor("#DC3545")), - ASSERT("Assert", Color.parseColor("#E83E8C")) + VERBOSE("Verbose", "#6C757D".toColorInt()), + DEBUG("Debug", "#000000".toColorInt()), + INFO("Info", "#007BFF".toColorInt()), + WARN("Warn", "#FFC107".toColorInt()), + ERROR("Error", "#DC3545".toColorInt()), + ASSERT("Assert", "#E83E8C".toColorInt()) } \ No newline at end of file