Merge pull request #12 from LDRAlighieri/update/dependencies

Update dependencies

.github/workflows/build.yml

@@ -10,16 +10,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2.4.2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Check build-logic
         run: ./gradlew check -p build-logic

.github/workflows/publish.yml

@@ -12,16 +12,16 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2.4.2
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Check build-logic
         run: ./gradlew check -p build-logic

CHANGELOG.md

@@ -1,6 +1,13 @@
 # ChangeLog
 
 
+## Version 0.4.1
+
+* Update: Kotlin to v1.9.23.
+* Update: Compose BOM to v2024.05.00.
+* Update: Minor update of other libraries.
+
+
 ## Version 0.4.0
 
 * New: Carbon(`composites-carbon`) module:

README.md

@@ -1,5 +1,5 @@
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.9.22-blue.svg?logo=kotlin)](https://kotlinlang.org)
-[![Compose BOM Version](https://img.shields.io/badge/Compose-v2024.01.00-blue.svg?logo=jetpackcompose)](https://developer.android.com/jetpack/compose)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-v1.9.23-blue.svg?logo=kotlin)](https://kotlinlang.org)
+[![Compose BOM Version](https://img.shields.io/badge/Compose-v2024.05.00-blue.svg?logo=jetpackcompose)](https://developer.android.com/jetpack/compose)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 [![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg)](https://android-arsenal.com/api?level=21)
@@ -41,11 +41,11 @@ Add one or more dependencies:
 ```kotlin
 dependencies {
     // Carbon
-    implementation("ru.ldralighieri.composites:composites-carbon-core:0.4.0")
-    ksp("ru.ldralighieri.composites:composites-carbon-processor:0.4.0")
+    implementation("ru.ldralighieri.composites:composites-carbon-core:0.4.1")
+    ksp("ru.ldralighieri.composites:composites-carbon-processor:0.4.1")
 
     // Fiberglass
-    implementation("ru.ldralighieri.composites:composites-fiberglass:0.4.0")
+    implementation("ru.ldralighieri.composites:composites-fiberglass:0.4.1")
 }
 ```
 

build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt

@@ -18,6 +18,7 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import ru.ldralighieri.composites.libs
 
 @Suppress("unused")
 internal class SpotlessConventionPlugin : Plugin<Project> {
@@ -30,11 +31,8 @@ internal class SpotlessConventionPlugin : Plugin<Project> {
                     target("**/*.kt")
                     targetExclude("**/build/**/*.kt")
 
-                    ktlint().editorConfigOverride(
-                        mapOf(
-                            "android" to "true",
-                        ),
-                    )
+                    ktlint(libs.findVersion("ktlint").get().toString())
+                        .editorConfigOverride(mapOf("android" to "true"))
 
                     licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
                 }

build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/CommonExtension+kotlinOptions.kt

@@ -20,6 +20,6 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.plugins.ExtensionAware
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
-internal fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
+internal fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
     (this as ExtensionAware).extensions.configure("kotlinOptions", block)
 }

build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureAndroidCompose.kt

@@ -23,7 +23,7 @@ import org.gradle.api.Project
 import java.io.File
 
 internal fun Project.configureAndroidCompose(
-    extension: CommonExtension<*, *, *, *, *>,
+    extension: CommonExtension<*, *, *, *, *, *>,
 ) {
     extension.apply {
         buildFeatures.compose = true

build-logic/convention/src/main/kotlin/ru/ldralighieri/composites/Project+configureKotlinAndroid.kt

@@ -24,7 +24,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.provideDelegate
 
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     val compileSdk: String by project
     val minSdk: String by project

composites-carbon/README.md

@@ -27,8 +27,8 @@ Add dependency:
 
 ```kotlin
 dependencies {
-    implementation("ru.ldralighieri.composites:composites-carbon-core:0.4.0")
-    ksp("ru.ldralighieri.composites:composites-carbon-processor:0.4.0")
+    implementation("ru.ldralighieri.composites:composites-carbon-core:0.4.1")
+    ksp("ru.ldralighieri.composites:composites-carbon-processor:0.4.1")
 }
 ```
 

composites-fiberglass/README.md

@@ -30,7 +30,7 @@ Add dependency:
 
 ```kotlin
 dependencies {
-    implementation("ru.ldralighieri.composites:composites-fiberglass:0.4.0")
+    implementation("ru.ldralighieri.composites:composites-fiberglass:0.4.1")
 }
 ```
 

gradle.properties

@@ -7,7 +7,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000
 
 # Maven
 GROUP=ru.ldralighieri.composites
-VERSION_NAME=0.5.0-SNAPSHOT
+VERSION_NAME=0.4.1
 
 POM_DESCRIPTION=Composites are a group of tools and handy libraries that make it easier to use Jetpack Compose.
 
@@ -44,3 +44,9 @@ ksp.incremental=false
 ksp.incremental.log=false
 # track classpath
 ksp.incremental.intermodule=true
+
+# System properties
+
+systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
+systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
+systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl

gradle/libs.versions.toml

@@ -1,31 +1,34 @@
 [versions]
 # Plugins
-agp = "8.2.2"
-dokka = "1.9.10"
+agp = "8.4.0"
+dokka = "1.9.20"
 spotless = "6.25.0"
-mavenPublish = "0.27.0"
+mavenPublish = "0.28.0"
 bcv = "0.14.0"
 gver = "0.51.0"
-ksp = "1.9.22-1.0.17"
+ksp = "1.9.23-1.0.20"
 
 # Kotlin
-kotlin = "1.9.22"
+kotlin = "1.9.23"
 
 # Androidx
 androidxCoreSplashscreen = "1.0.1"
-androidxActivity = "1.8.2"
-androidxNavigation = "2.7.6"
+androidxActivity = "1.9.0"
+androidxNavigation = "2.7.7"
 androidxPagingCompose = "3.2.1"
 # Compose
-androidxComposeCompiler = "1.5.8"
-androidxComposeBom = "2024.01.00"
+androidxComposeCompiler = "1.5.13"
+androidxComposeBom = "2024.05.00"
 
 # Google
-googleMaterial="1.11.0"
+googleMaterial="1.12.0"
 
 # KotlinPoet
 kotlinpoet="1.16.0"
 
+# Lint
+ktlint = "1.2.1"
+
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip