Skip to content

Commit 68a750b

Browse files
committed
update dependencies
- kotlin 1.9.0 (compose compiler 1.5.1) - material-components-android 1.9.0 - androidx-core 1.10.1 - androidx-activity 1.7.2
1 parent b06ca90 commit 68a750b

File tree

2 files changed

+14
-13
lines changed
  • bottomsheetdialog-compose/src/main/kotlin/com/holix/android/bottomsheetdialog/compose
  • buildSrc/src/main/kotlin/com/holix/android/bottomsheetdialog/compose

2 files changed

+14
-13
lines changed

bottomsheetdialog-compose/src/main/kotlin/com/holix/android/bottomsheetdialog/compose/BottomSheetDialog.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package com.holix.android.bottomsheetdialog.compose
22

3-
import androidx.compose.foundation.gestures.Orientation
4-
import androidx.compose.foundation.gestures.rememberScrollableState
5-
import androidx.compose.foundation.gestures.scrollable
6-
import android.annotation.SuppressLint
73
import android.content.Context
84
import android.graphics.Outline
95
import android.os.Build
@@ -13,6 +9,9 @@ import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
139
import androidx.annotation.FloatRange
1410
import androidx.annotation.IntRange
1511
import androidx.annotation.Px
12+
import androidx.compose.foundation.gestures.Orientation
13+
import androidx.compose.foundation.gestures.rememberScrollableState
14+
import androidx.compose.foundation.gestures.scrollable
1615
import androidx.compose.runtime.*
1716
import androidx.compose.runtime.saveable.rememberSaveable
1817
import androidx.compose.ui.ExperimentalComposeUiApi
@@ -32,8 +31,10 @@ import androidx.compose.ui.unit.dp
3231
import androidx.compose.ui.window.DialogWindowProvider
3332
import androidx.compose.ui.window.SecureFlagPolicy
3433
import androidx.core.view.WindowCompat
35-
import androidx.lifecycle.ViewTreeLifecycleOwner
36-
import androidx.lifecycle.ViewTreeViewModelStoreOwner
34+
import androidx.lifecycle.findViewTreeLifecycleOwner
35+
import androidx.lifecycle.findViewTreeViewModelStoreOwner
36+
import androidx.lifecycle.setViewTreeLifecycleOwner
37+
import androidx.lifecycle.setViewTreeViewModelStoreOwner
3738
import androidx.savedstate.findViewTreeSavedStateRegistryOwner
3839
import androidx.savedstate.setViewTreeSavedStateRegistryOwner
3940
import com.google.android.material.bottomsheet.BottomSheetBehavior.*
@@ -428,8 +429,8 @@ private class BottomSheetDialogWrapper(
428429
// Turn of all clipping so shadows can be drawn outside the window
429430
(window.decorView as? ViewGroup)?.disableClipping()
430431
setContentView(bottomSheetDialogLayout)
431-
ViewTreeLifecycleOwner.set(bottomSheetDialogLayout, ViewTreeLifecycleOwner.get(composeView))
432-
ViewTreeViewModelStoreOwner.set(bottomSheetDialogLayout, ViewTreeViewModelStoreOwner.get(composeView))
432+
bottomSheetDialogLayout.setViewTreeLifecycleOwner(composeView.findViewTreeLifecycleOwner())
433+
bottomSheetDialogLayout.setViewTreeViewModelStoreOwner(composeView.findViewTreeViewModelStoreOwner())
433434
bottomSheetDialogLayout.setViewTreeOnBackPressedDispatcherOwner(this)
434435
bottomSheetDialogLayout.setViewTreeSavedStateRegistryOwner(
435436
composeView.findViewTreeSavedStateRegistryOwner()

buildSrc/src/main/kotlin/com/holix/android/bottomsheetdialog/compose/Versions.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package com.holix.android.bottomsheetdialog.compose
33
object Versions {
44
internal const val ANDROID_GRADLE_PLUGIN = "7.3.1"
55
internal const val GRADLE_NEXUS_PUBLISH_PLUGIN = "1.1.0"
6-
internal const val KOTLIN = "1.7.20"
6+
internal const val KOTLIN = "1.9.0"
77

8-
internal const val MATERIAL = "1.8.0"
9-
internal const val ANDROIDX_CORE_KTX = "1.9.0"
8+
internal const val MATERIAL = "1.9.0"
9+
internal const val ANDROIDX_CORE_KTX = "1.10.1"
1010

1111
internal const val COMPOSE_BOM = "2023.01.00"
12-
const val COMPOSE_COMPILER = "1.3.2"
13-
internal const val ANDROIDX_ACTIVITY = "1.5.1"
12+
const val COMPOSE_COMPILER = "1.5.1"
13+
internal const val ANDROIDX_ACTIVITY = "1.7.2"
1414

1515
internal const val COLOR_PICKER = "1.0.0"
1616
}

0 commit comments

Comments
 (0)