Merge pull request #78 from AkYML/feature/library-upgrades

dkk009 · web-flow · commit 856e7f52d01d · 2023-04-04T14:57:11.000+05:30
upgrade kotlin version to 1.8.10 &amp; Other library updates,
diff --git a/YChartsLib/build.gradle.kts b/YChartsLib/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/YChartsLib/src/main/java/co/yml/charts/ui/barchart/BarChart.kt b/YChartsLib/src/main/java/co/yml/charts/ui/barchart/BarChart.kt
@@ -104,9 +104,7 @@ fun BarChart(modifier: Modifier, barChartData: BarChartData) {
                 .clickable {
                     if (isTalkBackEnabled) {
                         scope.launch {
-                            accessibilitySheetState.animateTo(
-                                ModalBottomSheetValue.Expanded
-                            )
+                            accessibilitySheetState.show()
                         }
                     }
                 },
diff --git a/YChartsLib/src/main/java/co/yml/charts/ui/barchart/GroupBarChart.kt b/YChartsLib/src/main/java/co/yml/charts/ui/barchart/GroupBarChart.kt
@@ -100,9 +100,7 @@ fun GroupBarChart(modifier: Modifier, groupBarChartData: GroupBarChartData) {
                 .clickable {
                     if (isTalkBackEnabled) {
                         scope.launch {
-                            accessibilitySheetState.animateTo(
-                                ModalBottomSheetValue.Expanded
-                            )
+                            accessibilitySheetState.show()
                         }
                     }
                 },
diff --git a/YChartsLib/src/main/java/co/yml/charts/ui/combinedchart/CombinedChart.kt b/YChartsLib/src/main/java/co/yml/charts/ui/combinedchart/CombinedChart.kt
@@ -130,9 +130,7 @@ fun CombinedChart(modifier: Modifier, combinedChartData: CombinedChartData) {
                     .clickable {
                         if (isTalkBackEnabled) {
                             scope.launch {
-                                accessibilitySheetState.animateTo(
-                                    ModalBottomSheetValue.Expanded
-                                )
+                                accessibilitySheetState.show()
                             }
                         }
                     },
diff --git a/YChartsLib/src/main/java/co/yml/charts/ui/linechart/LineChart.kt b/YChartsLib/src/main/java/co/yml/charts/ui/linechart/LineChart.kt
@@ -97,9 +97,7 @@ fun LineChart(modifier: Modifier, lineChartData: LineChartData) {
                 .clickable {
                     if (isTalkBackEnabled) {
                         scope.launch {
-                            accessibilitySheetState.animateTo(
-                                ModalBottomSheetValue.Expanded
-                            )
+                            accessibilitySheetState.show()
                         }
                     }
                 },
diff --git a/YChartsLib/src/main/java/co/yml/charts/ui/piechart/charts/DonuPieChart.kt b/YChartsLib/src/main/java/co/yml/charts/ui/piechart/charts/DonuPieChart.kt
@@ -97,9 +97,7 @@ fun DonutPieChart(
                 .clickable {
                     if (isTalkBackEnabled) {
                         scope.launch {
-                            accessibilitySheetState.animateTo(
-                                ModalBottomSheetValue.Expanded
-                            )
+                            accessibilitySheetState.show()
                         }
                     }
                 }) {
diff --git a/YChartsLib/src/main/java/co/yml/charts/ui/piechart/charts/PieChart.kt b/YChartsLib/src/main/java/co/yml/charts/ui/piechart/charts/PieChart.kt
@@ -104,9 +104,7 @@ fun PieChart(
                 .clickable {
                     if (isTalkBackEnabled) {
                         scope.launch {
-                            accessibilitySheetState.animateTo(
-                                ModalBottomSheetValue.Expanded
-                            )
+                            accessibilitySheetState.show()
                         }
                     }
                 },
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         applicationId = "co.yml.ycharts.app"
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,10 +9,10 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.3")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
-        classpath("org.jetbrains.kotlin:kotlin-android-extensions:1.6.10")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")
+        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+        classpath("org.jetbrains.kotlin:kotlin-android-extensions:1.8.10")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.20")
     }
 
     tasks {
diff --git a/buildSrc/src/main/java/co/ycharts/dependency/Version.kt b/buildSrc/src/main/java/co/ycharts/dependency/Version.kt
@@ -1,17 +1,17 @@
 package co.ycharts.dependency
 
 object Version {
-    const val CORE_KTX = "1.7.0"
-    const val APPCOMPAT = "1.4.2"
-    const val MATERIAL = "1.6.1"
-    const val MATERIAL_3 = "1.0.0-alpha01"
+    const val CORE_KTX = "1.9.0"
+    const val APPCOMPAT = "1.6.1"
+    const val MATERIAL = "1.8.0"
+    const val MATERIAL_3 = "1.0.1"
     const val JUNIT = "4.13.2"
     const val TEST_EXTN = "1.1.3"
     const val ESPRESSO_CORE = "3.4.0"
-    const val COMPOSE_COMPILER = "1.2.0"
-    const val COMPOSE_UI = "1.2.0-rc03"
-    const val COMPOSE_ACTIVITY = "1.3.1"
-    const val RUNTIME_KTX = "2.3.1'"
-    const val KOTLIN_COMPILER_EXT = "1.1.0"
-    const val MOCKK = "1.12.5"
+    const val COMPOSE_COMPILER = "1.4.4"
+    const val COMPOSE_UI = "1.4.0"
+    const val COMPOSE_ACTIVITY = "1.7.0"
+    const val RUNTIME_KTX = "2.6.1'"
+    const val KOTLIN_COMPILER_EXT = "1.4.4"
+    const val MOCKK = "1.13.4"
 }
diff --git a/experiments/chartcontainer/build.gradle.kts b/experiments/chartcontainer/build.gradle.kts
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         applicationId = "com.app.chartcontainer"
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
diff --git a/experiments/piechartcontainer/build.gradle.kts b/experiments/piechartcontainer/build.gradle.kts
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk = 32
+    compileSdk = 33
 
     defaultConfig {
         applicationId = "com.example.piechartcontainer"
         minSdk = 26
-        targetSdk = 32
+        targetSdk = 33
         versionCode = 1
         versionName = "1.0"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 25 13:24:31 IST 2022
+#Sat Apr 01 05:16:59 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ plugins {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`android {`
`10`		`- compileSdk = 32`
	`10`	`+ compileSdk = 33`
`11`	`11`
`12`	`12`	`defaultConfig {`
`13`	`13`	`minSdk = 26`
`14`		`- targetSdk = 32`
	`14`	`+ targetSdk = 33`
`15`	`15`
`16`	`16`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,7 @@ fun BarChart(modifier: Modifier, barChartData: BarChartData) {`
`104`	`104`	`.clickable {`
`105`	`105`	`if (isTalkBackEnabled) {`
`106`	`106`	`scope.launch {`
`107`		`- accessibilitySheetState.animateTo(`
`108`		`- ModalBottomSheetValue.Expanded`
`109`		`- )`
	`107`	`+ accessibilitySheetState.show()`
`110`	`108`	`}`
`111`	`109`	`}`
`112`	`110`	`},`
Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,7 @@ fun GroupBarChart(modifier: Modifier, groupBarChartData: GroupBarChartData) {`
`100`	`100`	`.clickable {`
`101`	`101`	`if (isTalkBackEnabled) {`
`102`	`102`	`scope.launch {`
`103`		`- accessibilitySheetState.animateTo(`
`104`		`- ModalBottomSheetValue.Expanded`
`105`		`- )`
	`103`	`+ accessibilitySheetState.show()`
`106`	`104`	`}`
`107`	`105`	`}`
`108`	`106`	`},`
Original file line number	Diff line number	Diff line change
`@@ -130,9 +130,7 @@ fun CombinedChart(modifier: Modifier, combinedChartData: CombinedChartData) {`
`130`	`130`	`.clickable {`
`131`	`131`	`if (isTalkBackEnabled) {`
`132`	`132`	`scope.launch {`
`133`		`- accessibilitySheetState.animateTo(`
`134`		`- ModalBottomSheetValue.Expanded`
`135`		`- )`
	`133`	`+ accessibilitySheetState.show()`
`136`	`134`	`}`
`137`	`135`	`}`
`138`	`136`	`},`
Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,7 @@ fun LineChart(modifier: Modifier, lineChartData: LineChartData) {`
`97`	`97`	`.clickable {`
`98`	`98`	`if (isTalkBackEnabled) {`
`99`	`99`	`scope.launch {`
`100`		`- accessibilitySheetState.animateTo(`
`101`		`- ModalBottomSheetValue.Expanded`
`102`		`- )`
	`100`	`+ accessibilitySheetState.show()`
`103`	`101`	`}`
`104`	`102`	`}`
`105`	`103`	`},`
Original file line number	Diff line number	Diff line change
`@@ -97,9 +97,7 @@ fun DonutPieChart(`
`97`	`97`	`.clickable {`
`98`	`98`	`if (isTalkBackEnabled) {`
`99`	`99`	`scope.launch {`
`100`		`- accessibilitySheetState.animateTo(`
`101`		`- ModalBottomSheetValue.Expanded`
`102`		`- )`
	`100`	`+ accessibilitySheetState.show()`
`103`	`101`	`}`
`104`	`102`	`}`
`105`	`103`	`}) {`
Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,7 @@ fun PieChart(`
`104`	`104`	`.clickable {`
`105`	`105`	`if (isTalkBackEnabled) {`
`106`	`106`	`scope.launch {`
`107`		`- accessibilitySheetState.animateTo(`
`108`		`- ModalBottomSheetValue.Expanded`
`109`		`- )`
	`107`	`+ accessibilitySheetState.show()`
`110`	`108`	`}`
`111`	`109`	`}`
`112`	`110`	`},`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ buildscript {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- classpath("com.android.tools.build:gradle:7.1.3")`
`13`		`- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")`
`14`		`- classpath("org.jetbrains.kotlin:kotlin-android-extensions:1.6.10")`
`15`		`- classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10")`
	`12`	`+ classpath("com.android.tools.build:gradle:7.4.2")`
	`13`	`+ classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")`
	`14`	`+ classpath("org.jetbrains.kotlin:kotlin-android-extensions:1.8.10")`
	`15`	`+ classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.20")`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`tasks {`