Update kotlin (#62)

LinX64 · May 27, 2024 · d7834e1 · d7834e1
1 parent cfdb5b0
commit d7834e1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.detekt)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -46,10 +47,6 @@ android {
         compose = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.14"
-    }
-
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,4 +4,5 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.detekt) apply false
     alias(libs.plugins.mavenPublish) apply false
+    alias(libs.plugins.compose.compiler) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.4.0"
+agp = "8.4.1"
 kotlin = "2.0.0"
 coreKtx = "1.13.1"
 lifecycleRuntimeKtx = "2.8.0"
@@ -27,7 +27,9 @@ reusableComponents = { group = "io.github.linx64", name = "reusablecomponents",
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
-mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
+mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
+
+jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
diff --git a/reusablecomponents/build.gradle.kts b/reusablecomponents/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrains.kotlin.android)
     alias(libs.plugins.mavenPublish)
+    alias(libs.plugins.compose.compiler)
 }
 
 android {
@@ -43,10 +44,6 @@ android {
         compose = true
         buildConfig = true
     }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.14"
-    }
 }
 
 dependencies {

diff --git a/...ablecomponents/src/main/kotlin/com/client/reusablecomponents/containers/CenteredColumn.kt b/...ablecomponents/src/main/kotlin/com/client/reusablecomponents/containers/CenteredColumn.kt
@@ -3,13 +3,11 @@ package com.client.reusablecomponents.containers
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import com.client.reusablecomponents.previews.AppScreenComponent
 
 @Composable
@@ -19,7 +17,6 @@ fun CenteredColumn(
 ) {
     Column(
         modifier = Modifier
-            .padding(16.dp)
             .fillMaxSize()
             .then(modifier),
         horizontalAlignment = Alignment.CenterHorizontally,