Merge branch 'compose-1.4' of github.com:holixfactory/bottomsheetdialog-compose

Author: workspace

app/build.gradle

@@ -45,7 +45,6 @@ android {
 
 dependencies {
     implementation project(":bottomsheetdialog-compose")
-    implementation platform(Dependencies.composeBom)
     implementation Dependencies.composeUI
     implementation Dependencies.composeFoundation
     implementation Dependencies.composeMaterial

bottomsheetdialog-compose/build.gradle

@@ -50,7 +50,6 @@ android {
 }
 
 dependencies {
-    implementation platform(Dependencies.composeBom)
     implementation Dependencies.composeUI
     implementation Dependencies.composeFoundation
     implementation Dependencies.androidxActivityKtx

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

@@ -1,9 +1,5 @@
 package com.holix.android.bottomsheetdialog.compose
 
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.foundation.gestures.rememberScrollableState
-import androidx.compose.foundation.gestures.scrollable
-import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Outline
 import android.os.Build
@@ -13,9 +9,11 @@ import androidx.activity.setViewTreeOnBackPressedDispatcherOwner
 import androidx.annotation.FloatRange
 import androidx.annotation.IntRange
 import androidx.annotation.Px
+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.gestures.rememberScrollableState
+import androidx.compose.foundation.gestures.scrollable
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.compositeOver
@@ -32,8 +30,10 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogWindowProvider
 import androidx.compose.ui.window.SecureFlagPolicy
 import androidx.core.view.WindowCompat
-import androidx.lifecycle.ViewTreeLifecycleOwner
-import androidx.lifecycle.ViewTreeViewModelStoreOwner
+import androidx.lifecycle.findViewTreeLifecycleOwner
+import androidx.lifecycle.findViewTreeViewModelStoreOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeViewModelStoreOwner
 import androidx.savedstate.findViewTreeSavedStateRegistryOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import com.google.android.material.bottomsheet.BottomSheetBehavior.*
@@ -257,7 +257,6 @@ private val BlackScrimmed: (Color) -> Color = { original ->
  * @param properties [BottomSheetDialogProperties] for further customization of this dialog's behavior.
  * @param content The content to be displayed inside the dialog.
  */
-@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun BottomSheetDialog(
     onDismissRequest: () -> Unit,
@@ -428,8 +427,8 @@ private class BottomSheetDialogWrapper(
         // Turn of all clipping so shadows can be drawn outside the window
         (window.decorView as? ViewGroup)?.disableClipping()
         setContentView(bottomSheetDialogLayout)
-        ViewTreeLifecycleOwner.set(bottomSheetDialogLayout, ViewTreeLifecycleOwner.get(composeView))
-        ViewTreeViewModelStoreOwner.set(bottomSheetDialogLayout, ViewTreeViewModelStoreOwner.get(composeView))
+        bottomSheetDialogLayout.setViewTreeLifecycleOwner(composeView.findViewTreeLifecycleOwner())
+        bottomSheetDialogLayout.setViewTreeViewModelStoreOwner(composeView.findViewTreeViewModelStoreOwner())
         bottomSheetDialogLayout.setViewTreeOnBackPressedDispatcherOwner(this)
         bottomSheetDialogLayout.setViewTreeSavedStateRegistryOwner(
             composeView.findViewTreeSavedStateRegistryOwner()

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

@@ -5,10 +5,10 @@ object Configuration {
     const val targetSdk = 33
     const val minSdk = 21
     const val majorVersion = 1
-    const val minorVersion = 1
-    const val patchVersion = 1
+    const val minorVersion = 2
+    const val patchVersion = 0
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 111
+    const val versionCode = 120
     const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
     const val artifactGroup = "com.holix.android"
 }

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

@@ -3,13 +3,14 @@ package com.holix.android.bottomsheetdialog.compose
 object Versions {
     internal const val ANDROID_GRADLE_PLUGIN = "7.3.1"
     internal const val GRADLE_NEXUS_PUBLISH_PLUGIN = "1.1.0"
-    internal const val KOTLIN = "1.7.20"
+    internal const val KOTLIN = "1.8.0"
 
     internal const val MATERIAL = "1.8.0"
     internal const val ANDROIDX_CORE_KTX = "1.9.0"
 
     internal const val COMPOSE_BOM = "2023.01.00"
-    const val COMPOSE_COMPILER = "1.3.2"
+    internal const val COMPOSE = "1.4.0-beta01"
+    const val COMPOSE_COMPILER = "1.4.1"
     internal const val ANDROIDX_ACTIVITY = "1.5.1"
 
     internal const val COLOR_PICKER = "1.0.0"
@@ -27,11 +28,11 @@ object Dependencies {
     const val androidxCoreKtx = "androidx.core:core-ktx:${Versions.ANDROIDX_CORE_KTX}"
 
     const val composeBom = "androidx.compose:compose-bom:${Versions.COMPOSE_BOM}"
-    const val composeUI = "androidx.compose.ui:ui"
-    const val composeRuntime = "androidx.compose.runtime:runtime"
-    const val composeMaterial = "androidx.compose.material:material"
-    const val composeFoundation = "androidx.compose.foundation:foundation"
-    const val composeTooling = "androidx.compose.ui:ui-tooling"
+    const val composeUI = "androidx.compose.ui:ui:${Versions.COMPOSE}"
+    const val composeRuntime = "androidx.compose.runtime:runtime:${Versions.COMPOSE}"
+    const val composeMaterial = "androidx.compose.material:material:${Versions.COMPOSE}"
+    const val composeFoundation = "androidx.compose.foundation:foundation:${Versions.COMPOSE}"
+    const val composeTooling = "androidx.compose.ui:ui-tooling:${Versions.COMPOSE}"
     const val composeActivity = "androidx.activity:activity-compose:${Versions.ANDROIDX_ACTIVITY}"
 
     const val colorPicker = "com.github.skydoves:colorpicker-compose:${Versions.COLOR_PICKER}"