Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions conventions/conventions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
`kotlin-dsl`
alias(libs.plugins.ktlint)
}

group = "com.multiplatform.td.conventions"
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,3 @@ class AndroidAppPlugin : Plugin<Project> {
}
}
}


Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ internal fun AndroidComponentsExtension<KotlinMultiplatformAndroidLibraryExtensi
internal fun Project.isAndroidResourcesShouldIncluded(): Boolean =
isCommonTestEnabled() ||
isAndroidUnitTestEnabled() ||
isaAndroidInstrumentedTestEnabled()
isaAndroidInstrumentedTestEnabled()

internal fun Project.isAndroidUnitTestEnabled(): Boolean =
layout.projectDirectory.dir("src/test").asFile.exists() ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.getByType
import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper

class BuildKonfigExtendingPlugin: Plugin<Project> {
class BuildKonfigExtendingPlugin : Plugin<Project> {

override fun apply(target: Project) = with(target) {
with(pluginManager) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ class ContributeKspPlugin : Plugin<Project> {

configureContributeCommonDependencies()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<Project> {
class DataMultiplatformPlugin : Plugin<Project> {

override fun apply(target: Project) = with(target) {
with(pluginManager) {
Expand Down Expand Up @@ -64,5 +64,3 @@ class DataMultiplatformPlugin: Plugin<Project> {
configureKspTargetMetadataDependencies()
}
}


Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.kotlin.dsl.apply

class DomainMultiplatformPlugin: Plugin<Project> {
class DomainMultiplatformPlugin : Plugin<Project> {

override fun apply(target: Project) = with(target) {
with(pluginManager) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ internal fun KotlinTargetContainerWithPresetFunctions.iosArches(): List<IosArch>
this::iosSimulatorArm64,
this::iosX64,
)

Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -67,8 +66,7 @@ internal fun KotlinMultiplatformExtension.applyCommonCompose(
internal fun applyTargetKspDependencies(
target: Project,
targets: List<String>,
) = with(target)
{
) = with(target) {
val isKtorfitAvailable = extensions.findByType<KtorfitPluginExtension>() != null
val isRoomAvailable = extensions.findByType<RoomExtension>() != null

Expand All @@ -83,8 +81,7 @@ internal fun applyTargetKspDependencies(
internal fun applyTargetKotlinInjectDependencies(
target: Project,
targets: List<String>,
) = with(target)
{
) = with(target) {
dependencies {
targets.forEach {
add(it, kotlinInjectCompilerKsp.asDependency())
Expand Down Expand Up @@ -134,7 +131,7 @@ internal fun KotlinMultiplatformExtension.configureMultiplatformDefaults(
internal fun KotlinMultiplatformExtension.iosTargets(
named: String,
isShared: Boolean = true,
options: Map<String, String> = emptyMap()
options: Map<String, String> = emptyMap(),
) {
iosArches().forEach { target ->
target().binaries.framework {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ class LanguageLintPlugin : Plugin<Project> {
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/")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ class LibraryMultiplatformPlugin : Plugin<Project> {
configureAndroidLibrary(target)
}

extensions.getByType<KotlinMultiplatformExtension>().apply {
configureMultiplatformDefaults {}
extensions.getByType<KotlinMultiplatformExtension>().apply {
configureMultiplatformDefaults {}
}

dependencies {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ internal fun Project.configureKspTargetMetadataDependencies() {
taskNames = when {
isAndroidTarget -> kotlinLibraryMetadataTargets()
else -> kotlinJvmMetadataTargets()
}
},
)
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class RoomMultiplatformPlugin : Plugin<Project> {

extensions.getByType<RoomExtension>().apply {
schemaDirectory(
"${project.projectDir.path}/schema"
"${project.projectDir.path}/schema",
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,3 @@ internal val Project.espressoCore
get() = libs.findLibrary("androidx.espresso.core")
internal val Project.robolectric
get() = libs.findLibrary("robolectric")


10 changes: 5 additions & 5 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"

Expand All @@ -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"
Expand Down