merge from main

Author: AkYML

YChartsLib/src/main/java/co/yml/charts/ui/bubblechart/BubbleChart.kt

@@ -156,7 +156,8 @@ fun BubbleChart(modifier: Modifier, bubbleChartData: BubbleChartData) {
                         xStart = columnWidth,
                         scrollOffset = scrollOffset,
                         zoomScale = xZoom,
-                        chartData = bubblePoints)
+                        chartData = bubblePoints,
+                        axisStart = columnWidth)
                 },
                 onDraw = { scrollOffset, xZoom ->
                     bubblePlotData.bubbles.forEach { line->

build-logic/src/main/java/conventions/ApplicationConventionPlugin.kt

@@ -1,6 +1,7 @@
 package conventions
 
 import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.Packaging
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalogsExtension
@@ -23,7 +24,7 @@ class ApplicationConventionPlugin : Plugin<Project> {
             }
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
-                packagingOptions {
+                fun Packaging.() {
                     resources {
                         excludes += "/META-INF/{AL2.0,LGPL2.1}"
                         excludes += "META-INF/DEPENDENCIES"