Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Commit

Permalink
Merge branch 'refs/heads/trunk' into compose-migration
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle/libs.versions.toml
  • Loading branch information
Goooler committed May 17, 2024
2 parents c9da8ca + 9988c47 commit 76502c1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion detekt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ Compose:
RememberContentMissing:
active: true
UnstableCollections:
active: true # Opt-in, disabled by default. Turn on if you want to enforce this (e.g. you have strong skipping disabled)
active: false # Opt-in, disabled by default. Turn on if you want to enforce this (e.g. you have strong skipping disabled)
ViewModelForwarding:
active: true
# -- You can optionally use this rule on things other than types ending in "ViewModel" or "Presenter" (which are the defaults). You can add your own via a regex here:
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ versionName = "1.9.0"
versionCode = "109000"
agp = "8.4.0"
androidX-activity = "1.9.0"
androidX-lifecycle = "2.7.0"
androidX-lifecycle = "2.8.0"
androidX-room = "2.6.1"
chucker = "4.0.0"
coil = "2.6.0"
Expand Down Expand Up @@ -41,24 +41,24 @@ androidX-compose-icons-extended = { module = "androidx.compose.material:material

androidX-activity = { module = "androidx.activity:activity", version.ref = "androidX-activity" }
androidX-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidX-activity" }
androidX-annotation = "androidx.annotation:annotation:1.7.1"
androidX-annotation = "androidx.annotation:annotation:1.8.0"
androidX-appCompat = "androidx.appcompat:appcompat:1.6.1"
androidX-browser = "androidx.browser:browser:1.8.0"
androidX-cardView = "androidx.cardview:cardview:1.0.0"
androidX-collection = "androidx.collection:collection-ktx:1.4.0"
androidX-constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
androidX-coordinatorLayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
androidX-core = "androidx.core:core-ktx:1.13.1"
androidX-fragment = "androidx.fragment:fragment-ktx:1.7.0"
androidX-fragment = "androidx.fragment:fragment-ktx:1.7.1"
androidX-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "androidX-lifecycle" }
androidX-lifecycle-viewModel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidX-lifecycle" }
androidX-lifecycle-viewModel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidX-lifecycle" }
androidX-paging = "androidx.paging:paging-runtime:3.2.1"
androidX-paging = "androidx.paging:paging-runtime:3.3.0"
androidX-recyclerView = "androidx.recyclerview:recyclerview:1.3.2"
androidX-room-compiler = { module = "androidx.room:room-compiler", version.ref = "androidX-room" }
androidX-room-ktx = { module = "androidx.room:room-ktx", version.ref = "androidX-room" }
androidX-room-runtime = { module = "androidx.room:room-runtime", version.ref = "androidX-room" }
androidX-viewPager2 = "androidx.viewpager2:viewpager2:1.0.0"
androidX-viewPager2 = "androidx.viewpager2:viewpager2:1.1.0"
androidX-webKit = "androidx.webkit:webkit:1.11.0"

square-leakCanary = "com.squareup.leakcanary:leakcanary-android:2.14"
Expand Down Expand Up @@ -91,7 +91,7 @@ srl-header = { module = "io.github.scwang90:refresh-header-classics", version.re
srl-kernel = { module = "io.github.scwang90:refresh-layout-kernel", version.ref = "srl" }
utils = "com.blankj:utilcodex:1.31.1"
ktlint = "com.pinterest.ktlint:ktlint-cli:1.2.1"
composeRules = "io.nlopez.compose.rules:detekt:0.3.21"
composeRules = "io.nlopez.compose.rules:detekt:0.4.0"

[bundles]
androidX-compose = [
Expand Down

0 comments on commit 76502c1

Please sign in to comment.