From 46f2ce718f19b2532b9ed50fb045eaa0a682c628 Mon Sep 17 00:00:00 2001
From: Hitesh Kumar <hitesh.kumar@navi.com>
Date: Fri, 24 Nov 2023 13:20:52 +0530
Subject: [PATCH] TP-49506 update kotlin ksp compilesdk and material3 version
 (#241)

---
 app/build.gradle                                       | 4 ++--
 gradle/libs.versions.toml                              | 4 ++--
 navi-uitron/build.gradle                               | 6 +++---
 navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7c34a19..31e4dcb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 android {
     namespace 'com.uitron.demo'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.uitron.demo"
@@ -64,7 +64,7 @@ android {
 }
 
 dependencies {
-    implementation platform("androidx.compose:compose-bom:2023.06.01")
+    implementation platform("androidx.compose:compose-bom:2023.10.01")
 
     implementation project(':navi-uitron')
     implementation 'androidx.appcompat:appcompat:1.6.1'
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1c1e6d2..06945d5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 androidGradlePlugin = "8.1.1"
 hilt = "2.48"
-kotlin = "1.9.10"
-ksp = "1.9.10-1.0.13"
+kotlin = "1.9.20"
+ksp = "1.9.20-1.0.14"
 
 [libraries]
 
diff --git a/navi-uitron/build.gradle b/navi-uitron/build.gradle
index ace993c..948a7b0 100644
--- a/navi-uitron/build.gradle
+++ b/navi-uitron/build.gradle
@@ -9,7 +9,7 @@ def VERSION_NAME = "1.0.33"
 
 android {
     namespace 'com.navi.uitron'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 21
@@ -81,7 +81,7 @@ publishing {
 }
 
 dependencies {
-    implementation platform("androidx.compose:compose-bom:2023.06.01")
+    implementation platform("androidx.compose:compose-bom:2023.10.01")
 
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.material:material"
@@ -101,5 +101,5 @@ dependencies {
     api "io.coil-kt:coil-compose:2.4.0"
     testImplementation "junit:junit:4.13.2"
     androidTestImplementation "androidx.test.ext:junit:1.1.5"
-    implementation 'androidx.compose.material3:material3:1.1.2'
+    implementation 'androidx.compose.material3:material3:1.2.0-alpha11'
 }
diff --git a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt
index 95ab375..3e70385 100644
--- a/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt
+++ b/navi-uitron/src/main/java/com/navi/uitron/utils/Ext.kt
@@ -619,7 +619,7 @@ fun String?.toDoubleWithSafe(): Double {
     }
 }
 
-fun getTextAlignment(textAlignment: String?): TextAlign? {
+fun getTextAlignment(textAlignment: String?): TextAlign {
     return when (textAlignment) {
         TextAlign.Start.toString() -> TextAlign.Start
         TextAlign.End.toString() -> TextAlign.End
@@ -627,7 +627,7 @@ fun getTextAlignment(textAlignment: String?): TextAlign? {
         TextAlign.Left.toString() -> TextAlign.Left
         TextAlign.Right.toString() -> TextAlign.Right
         TextAlign.Justify.toString() -> TextAlign.Justify
-        else -> null
+        else -> TextAlign.Unspecified
     }
 }
 
@@ -739,7 +739,7 @@ fun Modifier.conditional(condition : Boolean, modifier : Modifier.() -> Modifier
 fun RowScope.constraintsToModifier(rowConstraints: RowConstraints?): Modifier {
     return Modifier
         .conditional(rowConstraints?.rowWeight != null) {
-            weight(rowConstraints?.rowWeight?.weight ?: 0f, rowConstraints?.rowWeight?.fill ?: true)
+            weight(rowConstraints?.rowWeight?.weight ?: 1f, rowConstraints?.rowWeight?.fill ?: true)
         }
         .conditional(rowConstraints?.verticalAlignment != null) {
             align(getVerticalAlignment(rowConstraints?.verticalAlignment))
@@ -753,7 +753,7 @@ fun ColumnScope.constraintsToModifier(columnConstraints: ColumnConstraints?): Mo
     return Modifier
         .conditional(columnConstraints?.columnWeight != null) {
             weight(
-                columnConstraints?.columnWeight?.weight ?: 0f,
+                columnConstraints?.columnWeight?.weight ?: 1f,
                 columnConstraints?.columnWeight?.fill ?: true
             )
         }