Merge pull request #31 from holixfactory/compose-1.5

Use compose-1.5 as main branch

Author: workspace

app/build.gradle

@@ -28,11 +28,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose = true
@@ -45,6 +45,7 @@ android {
 
 dependencies {
     implementation project(":bottomsheetdialog-compose")
+    implementation platform(Dependencies.composeBom)
     implementation Dependencies.composeUI
     implementation Dependencies.composeFoundation
     implementation Dependencies.composeMaterial

bottomsheetdialog-compose/build.gradle

@@ -34,11 +34,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         buildConfig = false
@@ -50,6 +50,7 @@ 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

@@ -387,7 +387,6 @@ private class BottomSheetDialogWrapper(
 
     init {
         val window = window ?: error("Dialog has no window")
-        window.requestFeature(Window.FEATURE_NO_TITLE)
         window.setBackgroundDrawableResource(android.R.color.transparent)
         bottomSheetDialogLayout = BottomSheetDialogLayout(context, window).apply {
             // Set unique id for AbstractComposeView. This allows state restoration for the state

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

@@ -1,14 +1,14 @@
 package com.holix.android.bottomsheetdialog.compose
 
 object Configuration {
-    const val compileSdk = 33
+    const val compileSdk = 34
     const val targetSdk = 33
     const val minSdk = 21
     const val majorVersion = 1
-    const val minorVersion = 2
+    const val minorVersion = 3
     const val patchVersion = 1
     const val versionName = "$majorVersion.$minorVersion.$patchVersion"
-    const val versionCode = 121
+    const val versionCode = 131
     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

@@ -1,16 +1,16 @@
 package com.holix.android.bottomsheetdialog.compose
 
 object Versions {
-    internal const val ANDROID_GRADLE_PLUGIN = "7.3.1"
+    internal const val ANDROID_GRADLE_PLUGIN = "8.1.0"
     internal const val GRADLE_NEXUS_PUBLISH_PLUGIN = "1.1.0"
-    internal const val KOTLIN = "1.8.10"
+    internal const val KOTLIN = "1.9.0"
 
-    internal const val MATERIAL = "1.8.0"
-    internal const val ANDROIDX_CORE_KTX = "1.10.0"
+    internal const val MATERIAL = "1.9.0"
+    internal const val ANDROIDX_CORE_KTX = "1.10.1"
 
-    internal const val COMPOSE = "1.4.1"
-    const val COMPOSE_COMPILER = "1.4.3"
-    internal const val ANDROIDX_ACTIVITY = "1.7.0"
+    internal const val COMPOSE_BOM = "2023.08.00"
+    const val COMPOSE_COMPILER = "1.5.1"
+    internal const val ANDROIDX_ACTIVITY = "1.7.2"
 
     internal const val COLOR_PICKER = "1.0.0"
 }
@@ -26,11 +26,12 @@ object Dependencies {
     const val androidxActivityKtx = "androidx.activity:activity-ktx:${Versions.ANDROIDX_ACTIVITY}"
     const val androidxCoreKtx = "androidx.core:core-ktx:${Versions.ANDROIDX_CORE_KTX}"
 
-    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 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 composeActivity = "androidx.activity:activity-compose:${Versions.ANDROIDX_ACTIVITY}"
 
     const val colorPicker = "com.github.skydoves:colorpicker-compose:${Versions.COLOR_PICKER}"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jun 30 03:04:54 KST 2022
+#Fri Aug 11 17:13:17 KST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists