Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
matheus-corregiari committed Nov 16, 2023
1 parent 8733713 commit e445597
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 27 deletions.
22 changes: 0 additions & 22 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,6 @@ dependencyResolutionManagement {
versionCatalogs {
libraries {
from(files("$rootDir/tools/libs.versions.toml"))

// Comment this when you start to update some libraries
library("x-normalize-001", "androidx.activity:activity:1.8.0")
library("x-normalize-002", "androidx.annotation:annotation-experimental:1.3.0")
library("x-normalize-003", "androidx.arch.core:core-common:2.2.0")
library("x-normalize-004", "androidx.arch.core:core-runtime:2.2.0")
library("x-normalize-005", "androidx.collection:collection:1.1.0")
library("x-normalize-006", "androidx.core:core-ktx:1.9.0")
library("x-normalize-007", "androidx.customview:customview:1.1.0")
library("x-normalize-008", "androidx.drawerlayout:drawerlayout:1.1.1")
library("x-normalize-009", "androidx.lifecycle:lifecycle-common:2.6.2")
library("x-normalize-010", "androidx.viewpager2:viewpager2:1.1.0-beta02")
library("x-normalize-011", "androidx.test:monitor:1.6.1")
library("x-normalize-012", "androidx.test:runner:1.5.2")
library("x-normalize-013", "com.google.auto.value:auto-value-annotations:1.9")
library("x-normalize-014", "com.google.code.findbugs:jsr305:3.0.2")
library("x-normalize-015", "com.squareup:javawritter:2.5.0")
library("x-normalize-016", "org.jetbrains.kotlin:kotlin-stdlib:1.9.10")
library("x-normalize-017", "org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10")
library("x-normalize-018", "org.jetbrains.kotlin:kotlin-reflect:1.9.10")
library("x-normalize-019", "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4")
library("x-normalize-020", "org.jetbrains:annotations:20.1.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1052,8 +1052,8 @@ class ObserveWrapper<T> internal constructor() {
@NonNull liveData: ResponseLiveData<T>,
@NonNull owner: LifecycleOwner
): ResponseLiveData<T> {
val observer = object : Observer<DataResult<T>> {
override fun onChanged(value: DataResult<T>) {
val observer = object : Observer<DataResult<T>?> {
override fun onChanged(value: DataResult<T>?) {
scope.launchWithErrorTreatment {
handleResult(value)
if (eventList.isEmpty()) {
Expand Down
31 changes: 28 additions & 3 deletions tools/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ build-tools = "34.0.0"

## JetBrains
jetbrains-kotlin = "1.9.10"
jetbrains-coroutines = "1.6.4"
jetbrains-coroutines = "1.6.4" # Quebra a parte de tratamento de exception no ObserveWrapper
jetbrains-kover = "0.7.4"

## AndroidX
Expand All @@ -28,7 +28,7 @@ androidx-constraint = "2.2.0-alpha13"
androidx-recyclerview = "1.3.2"
androidx-lifecycle-livedata = "2.6.2"
androidx-lifecycle-runtime = "2.6.2"
androidx-window = "1.1.0"
androidx-window = "1.2.0"
androidx-splash = "1.0.1"
androidx-test-core = "2.2.0"
androidx-test-junit = "1.1.5"
Expand All @@ -41,7 +41,7 @@ androidx-compose-material3 = "1.1.2"
androidx-compose-constraint = "1.0.1"
androidx-compose-core = "1.5.4"
androidx-compose-lifecycle = "2.6.2"
androidx-compose-activity = "1.8.0"
androidx-compose-activity = "1.8.1"

## SquareUp
square-retrofit = "2.9.0"
Expand Down Expand Up @@ -113,6 +113,31 @@ junit-test = { group = "junit", name = "junit", version.ref = "junit" }
robolectric-test = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }




## Comment this when you start to update some libraries
x-normalize-001 = { group = "androidx.activity", name = "activity", version.ref = "androidx-compose-activity" }
x-normalize-002 = { group = "androidx.annotation", name = "annotation-experimental", version = "1.3.1" }
x-normalize-003 = { group = "androidx.arch.core", name = "core-common", version = "2.2.0" }
x-normalize-004 = { group = "androidx.arch.core", name = "core-runtime", version = "2.2.0" }
x-normalize-005 = { group = "androidx.collection", name = "collection", version = "1.3.0" }
x-normalize-006 = { group = "androidx.core", name = "core-ktx", version = "1.12.0" }
x-normalize-007 = { group = "androidx.customview", name = "customview", version = "1.1.0" }
x-normalize-008 = { group = "androidx.drawerlayout", name = "drawerlayout", version = "1.2.0" }
x-normalize-009 = { group = "androidx.lifecycle", name = "lifecycle-common", version = "2.6.2" }
x-normalize-010 = { group = "androidx.viewpager2", name = "viewpager2", version = "1.1.0-beta02" }
x-normalize-011 = { group = "androidx.test", name = "monitor", version = "1.6.1" }
x-normalize-012 = { group = "androidx.test", name = "runner", version = "1.5.2" }
x-normalize-013 = { group = "com.google.auto.value", name = "auto-value-annotations", version = "1.9" }
x-normalize-014 = { group = "com.google.code.findbugs", name = "jsr305", version = "3.0.2" }
x-normalize-015 = { group = "com.squareup", name = "javawritter", version = "2.5.0" }
x-normalize-016 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "jetbrains-kotlin" }
x-normalize-017 = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-common", version.ref = "jetbrains-kotlin" }
x-normalize-018 = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "jetbrains-kotlin" }
x-normalize-019 = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version.ref = "jetbrains-coroutines" }
x-normalize-020 = { group = "org.jetbrains", name = "annotations", version = "20.1.0" }

# ------------------------------------------------------------------------------------------------ #
[plugins]

Expand Down

0 comments on commit e445597

Please sign in to comment.