diff --git a/conventions/conventions/build.gradle.kts b/conventions/conventions/build.gradle.kts index de08e7e3..9cc63fc9 100644 --- a/conventions/conventions/build.gradle.kts +++ b/conventions/conventions/build.gradle.kts @@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { `kotlin-dsl` + alias(libs.plugins.ktlint) } group = "com.multiplatform.td.conventions" @@ -11,6 +12,11 @@ java { targetCompatibility = JavaVersion.VERSION_21 } +ktlint { + version.set("1.7.1") + enableExperimentalRules.set(true) +} + kotlin { compilerOptions { jvmTarget.set(JvmTarget.JVM_21) diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppPlugin.kt index 3d309330..8c653a0c 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidAppPlugin.kt @@ -50,5 +50,3 @@ class AndroidAppPlugin : Plugin { } } } - - diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidLibraryKotlin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidLibraryKotlin.kt index d757f517..abd5cce6 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidLibraryKotlin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/AndroidLibraryKotlin.kt @@ -80,7 +80,7 @@ internal fun AndroidComponentsExtension { +class BuildKonfigExtendingPlugin : Plugin { override fun apply(target: Project) = with(target) { with(pluginManager) { diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ContributeKspPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ContributeKspPlugin.kt index ee468a40..ad30975d 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ContributeKspPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ContributeKspPlugin.kt @@ -27,4 +27,4 @@ class ContributeKspPlugin : Plugin { configureContributeCommonDependencies() } -} \ No newline at end of file +} diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DataMultiplatformPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DataMultiplatformPlugin.kt index 14f781ac..7491063f 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DataMultiplatformPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DataMultiplatformPlugin.kt @@ -10,7 +10,7 @@ import org.gradle.kotlin.dsl.getByType import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlinx.serialization.gradle.SerializationGradleSubplugin -class DataMultiplatformPlugin: Plugin { +class DataMultiplatformPlugin : Plugin { override fun apply(target: Project) = with(target) { with(pluginManager) { @@ -64,5 +64,3 @@ class DataMultiplatformPlugin: Plugin { configureKspTargetMetadataDependencies() } } - - diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DomainMultiplatformPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DomainMultiplatformPlugin.kt index 6bf5a071..7d97064b 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DomainMultiplatformPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/DomainMultiplatformPlugin.kt @@ -4,7 +4,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply -class DomainMultiplatformPlugin: Plugin { +class DomainMultiplatformPlugin : Plugin { override fun apply(target: Project) = with(target) { with(pluginManager) { diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/IosArchExtension.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/IosArchExtension.kt index 40bf18f7..8c783a64 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/IosArchExtension.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/IosArchExtension.kt @@ -12,4 +12,3 @@ internal fun KotlinTargetContainerWithPresetFunctions.iosArches(): List this::iosSimulatorArm64, this::iosX64, ) - diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectCommonMultiplatformPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectCommonMultiplatformPlugin.kt index 0e63613b..45ad9f2c 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectCommonMultiplatformPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectCommonMultiplatformPlugin.kt @@ -1,7 +1,6 @@ package com.multiplatform.td.conventions import com.google.devtools.ksp.gradle.KspExtension -import com.google.devtools.ksp.gradle.KspGradleSubplugin import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectMultiplatformPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectMultiplatformPlugin.kt index 4eb8875f..36af2b65 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectMultiplatformPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinInjectMultiplatformPlugin.kt @@ -1,7 +1,6 @@ package com.multiplatform.td.conventions import com.google.devtools.ksp.gradle.KspExtension -import com.google.devtools.ksp.gradle.KspGradleSubplugin import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.apply diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinMultiplatformExtensions.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinMultiplatformExtensions.kt index 7666953a..2eb839c7 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinMultiplatformExtensions.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/KotlinMultiplatformExtensions.kt @@ -7,7 +7,6 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.findByType import org.gradle.kotlin.dsl.withType -import org.jetbrains.compose.ComposePlugin import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask @@ -67,8 +66,7 @@ internal fun KotlinMultiplatformExtension.applyCommonCompose( internal fun applyTargetKspDependencies( target: Project, targets: List, -) = with(target) -{ +) = with(target) { val isKtorfitAvailable = extensions.findByType() != null val isRoomAvailable = extensions.findByType() != null @@ -83,8 +81,7 @@ internal fun applyTargetKspDependencies( internal fun applyTargetKotlinInjectDependencies( target: Project, targets: List, -) = with(target) -{ +) = with(target) { dependencies { targets.forEach { add(it, kotlinInjectCompilerKsp.asDependency()) @@ -134,7 +131,7 @@ internal fun KotlinMultiplatformExtension.configureMultiplatformDefaults( internal fun KotlinMultiplatformExtension.iosTargets( named: String, isShared: Boolean = true, - options: Map = emptyMap() + options: Map = emptyMap(), ) { iosArches().forEach { target -> target().binaries.framework { diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LanguageLintPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LanguageLintPlugin.kt index 95063528..016f3090 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LanguageLintPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LanguageLintPlugin.kt @@ -21,10 +21,10 @@ class LanguageLintPlugin : Plugin { filter { exclude { element -> val path = element.file.path - path.contains("\\generated\\") - || path.contains("/generated/") - || path.contains("\\buildkonfig\\") - || path.contains("/buildkonfig/") + path.contains("\\generated\\") || + path.contains("/generated/") || + path.contains("\\buildkonfig\\") || + path.contains("/buildkonfig/") } } } diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LibraryMultiplatformPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LibraryMultiplatformPlugin.kt index 59451bbb..4c6f274d 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LibraryMultiplatformPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/LibraryMultiplatformPlugin.kt @@ -25,8 +25,8 @@ class LibraryMultiplatformPlugin : Plugin { configureAndroidLibrary(target) } - extensions.getByType().apply { - configureMultiplatformDefaults {} + extensions.getByType().apply { + configureMultiplatformDefaults {} } dependencies {} diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ProjectExtensions.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ProjectExtensions.kt index 07d6cc5d..f0c98ec4 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ProjectExtensions.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/ProjectExtensions.kt @@ -81,8 +81,7 @@ internal fun Project.configureKspTargetMetadataDependencies() { taskNames = when { isAndroidTarget -> kotlinLibraryMetadataTargets() else -> kotlinJvmMetadataTargets() - } + }, ) } } - diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/RoomMultiplatformPlugin.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/RoomMultiplatformPlugin.kt index 325d1dcb..ebebf3c5 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/RoomMultiplatformPlugin.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/RoomMultiplatformPlugin.kt @@ -21,7 +21,7 @@ class RoomMultiplatformPlugin : Plugin { extensions.getByType().apply { schemaDirectory( - "${project.projectDir.path}/schema" + "${project.projectDir.path}/schema", ) } diff --git a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/VersionCatalogPluginExtensions.kt b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/VersionCatalogPluginExtensions.kt index 1759390d..461c1942 100644 --- a/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/VersionCatalogPluginExtensions.kt +++ b/conventions/conventions/src/main/kotlin/com/multiplatform/td/conventions/VersionCatalogPluginExtensions.kt @@ -112,5 +112,3 @@ internal val Project.espressoCore get() = libs.findLibrary("androidx.espresso.core") internal val Project.robolectric get() = libs.findLibrary("robolectric") - - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc6ada4d..a22693a4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,16 +7,16 @@ androidx-lifecycle = "2.9.6" android-tools = "32.0.0" androidx-test = "1.7.0" androidx-test-junit = "1.3.0" -compose-multiplatform = "1.10.0" +compose-multiplatform = "1.10.1" compose-material3 = "1.9.0" compose-android = "1.10.2" android-desugar-jdk-libs = "2.1.5" junit = "4.13.2" -kotlin = "2.3.0" +kotlin = "2.3.10" kotlin-serilization = "1.10.0" kotlin-datetime = "0.7.1" kotlin-coroutines = "1.10.2" -navigation-compose = "2.9.1" +navigation-compose = "2.9.2" ksp = "2.3.4" room = "2.8.4" sqplite-bundled = "2.6.2" @@ -31,7 +31,7 @@ robolectiric = "4.16.1" kotlin-inject = "0.9.0" coil = "3.3.0" ktlint = "14.0.1" -kover = "0.9.5" +kover = "0.9.7" espresso = "3.7.0" orchestrator = "1.6.1" @@ -42,7 +42,7 @@ android-targetSdk = "36" material3Android = "1.4.0" preview-scanner = "0.8.1" -roborazzi = "1.57.0" +roborazzi = "1.59.0" kotlin-compile-testing = "0.12.1" junit5 = "6.0.2"