Skip to content

Commit 573daa6

Browse files
authored
ANDROID-16186 update target sdk (#25)
* ANDROID-16186 update target sdk * Fix lint
1 parent a325e1b commit 573daa6

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdk 35
7+
compileSdk 36
88

99
defaultConfig {
1010
applicationId "com.telefonica.androidlogger.app"
1111
minSdkVersion 21
12-
targetSdkVersion 35
12+
targetSdkVersion 36
1313
versionCode 1
1414
versionName "1.0.0"
1515

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
22
activity = "1.10.1"
3-
android-gradle-plugin = "8.7.3"
3+
android-gradle-plugin = "8.11.1"
44
junit = "4.13.2"
5-
kotlin = "2.0.21"
5+
kotlin = "2.1.20"
66
androidx-lifecycle = "2.2.0"
77
material = "1.12.0"
88
elviswhew-xlog = "1.11.1"
9-
okio = "3.9.1"
9+
okio = "3.16.0"
1010

1111
[libraries]
1212
androidx-activity = { module = "androidx.activity:activity", version.ref = "activity" }
1313
androidx-annotation = { module = "androidx.annotation:annotation", version = "1.9.1" }
14-
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" }
14+
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
1515
androidx-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "androidx-lifecycle" }
1616
com-google-android-material = { module = "com.google.android.material:material", version.ref = "material" }
1717
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" }
2323
com-android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
2424
com-android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
2525
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
26-
gitlab-arturbosch-detekt = "io.gitlab.arturbosch.detekt:1.23.7"
26+
gitlab-arturbosch-detekt = "io.gitlab.arturbosch.detekt:1.23.8"
2727
github-gradle-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins{
44
}
55

66
android {
7-
compileSdk 35
7+
compileSdk 36
88

99
defaultConfig {
1010
minSdkVersion 21
11-
targetSdkVersion 35
11+
targetSdkVersion 36
1212
}
1313

1414
flavorDimensions "loggerMode"

library/src/enabled/java/com/telefonica/androidlogger/ui/viewmodel/AppLoggerViewModels.kt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import com.telefonica.androidlogger.ui.livedata.map
1818
import com.telefonica.androidlogger.ui.livedata.throttle
1919
import java.text.SimpleDateFormat
2020
import java.util.*
21+
import androidx.core.graphics.toColorInt
2122

2223
internal class AppLoggerViewModel : ViewModel() {
2324

@@ -168,10 +169,10 @@ internal enum class LogPriorityViewModel(
168169
val displayName: String,
169170
@ColorInt val color: Int
170171
) {
171-
VERBOSE("Verbose", Color.parseColor("#6C757D")),
172-
DEBUG("Debug", Color.parseColor("#000000")),
173-
INFO("Info", Color.parseColor("#007BFF")),
174-
WARN("Warn", Color.parseColor("#FFC107")),
175-
ERROR("Error", Color.parseColor("#DC3545")),
176-
ASSERT("Assert", Color.parseColor("#E83E8C"))
172+
VERBOSE("Verbose", "#6C757D".toColorInt()),
173+
DEBUG("Debug", "#000000".toColorInt()),
174+
INFO("Info", "#007BFF".toColorInt()),
175+
WARN("Warn", "#FFC107".toColorInt()),
176+
ERROR("Error", "#DC3545".toColorInt()),
177+
ASSERT("Assert", "#E83E8C".toColorInt())
177178
}

0 commit comments

Comments
 (0)