Skip to content

Commit

Permalink
fun
Browse files Browse the repository at this point in the history
  • Loading branch information
mareklangiewicz committed Nov 24, 2023
1 parent f213552 commit d2d48c7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 20 deletions.
6 changes: 1 addition & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ defaultBuildTemplateForRootProject(
withSonatypeOssPublishing = true,
)

// FIXME: make sure this region below is synced, but not as a part of "self-sync" as it was in DepsKt,
// but as normal sync when syncing all regions in all projects.
// The "self-sync" should only sync templates (and be renamed to templates-sync or sth)

// region [Root Build Template]

/** Publishing to Sonatype OSSRH has to be explicitly allowed here, by setting withSonatypeOssPublishing to true. */
Expand Down Expand Up @@ -76,4 +72,4 @@ fun Project.defaultSonatypeOssNexusPublishing(
}
}

// endregion [Root Build Template]
// endregion [Root Build Template]
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pluginManagement {
}

plugins {
id("pl.mareklangiewicz.deps.settings") version "0.2.58" // https://plugins.gradle.org/search?term=mareklangiewicz
id("pl.mareklangiewicz.deps.settings") version "0.2.61" // https://plugins.gradle.org/search?term=mareklangiewicz
id("com.gradle.enterprise") version "3.15.1" // https://docs.gradle.com/enterprise/gradle-plugin/
}

Expand Down
8 changes: 3 additions & 5 deletions smokk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ fun TaskContainer.withPublishingPrintln() = withType<AbstractPublishToMaven>().c
}
}

@Suppress("UNUSED_VARIABLE")
fun Project.defaultBuildTemplateForJvmLib(
details: LibDetails = rootExtLibDetails,
withTestJUnit4: Boolean = false,
Expand Down Expand Up @@ -267,7 +266,6 @@ fun Project.defaultBuildTemplateForMppLib(
}

/** Only for very standard small libs. In most cases it's better to not use this function. */
@Suppress("UNUSED_VARIABLE")
fun KotlinMultiplatformExtension.allDefault(
withJvm: Boolean = true,
withJs: Boolean = true,
Expand Down Expand Up @@ -323,17 +321,17 @@ fun KotlinMultiplatformExtension.jsDefault(
) {
js(IR) {
if (withBrowser) browser {
testTask(Action {
testTask {
useKarma {
when (testWithChrome to testHeadless) {
true to true -> useChromeHeadless()
true to false -> useChrome()
}
}
})
}
}
if (withNode) nodejs()
}
}

// endregion [MPP Module Build Template]
// endregion [MPP Module Build Template]
8 changes: 3 additions & 5 deletions smokksample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ fun TaskContainer.withPublishingPrintln() = withType<AbstractPublishToMaven>().c
}
}

@Suppress("UNUSED_VARIABLE")
fun Project.defaultBuildTemplateForJvmLib(
details: LibDetails = rootExtLibDetails,
withTestJUnit4: Boolean = false,
Expand Down Expand Up @@ -275,7 +274,6 @@ fun Project.defaultBuildTemplateForMppLib(
}

/** Only for very standard small libs. In most cases it's better to not use this function. */
@Suppress("UNUSED_VARIABLE")
fun KotlinMultiplatformExtension.allDefault(
withJvm: Boolean = true,
withJs: Boolean = true,
Expand Down Expand Up @@ -331,14 +329,14 @@ fun KotlinMultiplatformExtension.jsDefault(
) {
js(IR) {
if (withBrowser) browser {
testTask(Action {
testTask {
useKarma {
when (testWithChrome to testHeadless) {
true to true -> useChromeHeadless()
true to false -> useChrome()
}
}
})
}
}
if (withNode) nodejs()
}
Expand Down Expand Up @@ -399,4 +397,4 @@ fun Project.defaultBuildTemplateForMppApp(
}
}

// endregion [MPP App Build Template]
// endregion [MPP App Build Template]
6 changes: 2 additions & 4 deletions smokkx/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ fun TaskContainer.withPublishingPrintln() = withType<AbstractPublishToMaven>().c
}
}

@Suppress("UNUSED_VARIABLE")
fun Project.defaultBuildTemplateForJvmLib(
details: LibDetails = rootExtLibDetails,
withTestJUnit4: Boolean = false,
Expand Down Expand Up @@ -268,7 +267,6 @@ fun Project.defaultBuildTemplateForMppLib(
}

/** Only for very standard small libs. In most cases it's better to not use this function. */
@Suppress("UNUSED_VARIABLE")
fun KotlinMultiplatformExtension.allDefault(
withJvm: Boolean = true,
withJs: Boolean = true,
Expand Down Expand Up @@ -324,14 +322,14 @@ fun KotlinMultiplatformExtension.jsDefault(
) {
js(IR) {
if (withBrowser) browser {
testTask(Action {
testTask {
useKarma {
when (testWithChrome to testHeadless) {
true to true -> useChromeHeadless()
true to false -> useChrome()
}
}
})
}
}
if (withNode) nodejs()
}
Expand Down

0 comments on commit d2d48c7

Please sign in to comment.