Merge pull request #38 from LinX64/develop

Merging develop to master
LinX64 · Apr 13, 2024 · 83d7bf2 · 83d7bf2
2 parents 9454bb2 + 3e33447
commit 83d7bf2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -77,7 +77,7 @@ dependencies {
 
     // The library
     //implementation(libs.reusableComponents)
-    implementation(project(":reusablecomponents"))
+    implementation(projects.reusablecomponents)
 
     detektPlugins(libs.detekt.formatting)
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.3.1"
+agp = "8.3.2"
 kotlin = "1.9.23"
 coreKtx = "1.12.0"
 lifecycleRuntimeKtx = "2.7.0"
@@ -8,7 +8,7 @@ composeBom = "2024.04.00"
 material-3 = "1.2.1"
 detekt = "1.23.6"
 mavenPublish = "0.28.0"
-reuseableComponents = "1.1.2"
+reusableComponents = "1.1.3"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -23,7 +23,7 @@ androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-man
 androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }
 androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material-3" }
 detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
-reusableComponents = { group = "io.github.linx64", name = "reusablecomponents", version.ref = "reuseableComponents" }
+reusableComponents = { group = "io.github.linx64", name = "reusablecomponents", version.ref = "reusableComponents" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

diff --git a/reusablecomponents/build.gradle.kts b/reusablecomponents/build.gradle.kts
@@ -3,7 +3,7 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.jetbrains.kotlin.android)
-    id(libs.plugins.mavenPublish.get().pluginId)
+    alias(libs.plugins.mavenPublish)
 }
 
 android {