-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
only apply java-base instead of java to get rid of MPP issues
moreover: - solve the double gradle test error message printing caused by vlsi-gradle-extension
- Loading branch information
Showing
9 changed files
with
46 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 10 additions & 4 deletions
14
gradle/build-logic/dev/src/main/kotlin/build-logic.junit-jacoco-conventions.gradle.kts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,15 @@ | ||
import org.gradle.api.tasks.testing.logging.TestLogEvent | ||
|
||
plugins { | ||
id("ch.tutteli.gradle.plugins.junitjacoco") | ||
} | ||
|
||
dependencies { | ||
// used to run the samples | ||
testImplementation("org.junit.jupiter:junit-jupiter-api") | ||
testImplementation("org.junit.jupiter:junit-jupiter-params") | ||
// adjust because we use com.github.vlsi.gradle-extensions which prints tests differently, otherwise we print | ||
// the failed tests twice. | ||
tasks.withType<Test>().configureEach { | ||
testLogging { | ||
// Empty enum throws "Collection is empty", so we use Iterable method | ||
setEvents((events - TestLogEvent.FAILED) as Iterable<TestLogEvent>) | ||
showStackTraces = false | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 0 additions & 8 deletions
8
gradle/build-logic/dev/src/main/kotlin/build-logic.kotlin-jvm.gradle.kts
This file was deleted.
Oops, something went wrong.
26 changes: 26 additions & 0 deletions
26
...e/build-logic/dev/src/main/kotlin/build-logic.kotlin-multiplatform-conventions.gradle.kts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import org.gradle.kotlin.dsl.kotlin | ||
|
||
plugins { | ||
kotlin("multiplatform") | ||
id("build-logic.gradle-conventions") | ||
} | ||
|
||
kotlin { | ||
sourceSets { | ||
// necessary due to https://youtrack.jetbrains.com/issue/KT-65352/KMP-Gradle-impossible-to-set-language-apiVersion-for-common-to-1.4 | ||
all { | ||
languageSettings { | ||
languageVersion = buildParameters.kotlin.version | ||
apiVersion = buildParameters.kotlin.version | ||
} | ||
} | ||
} | ||
} | ||
|
||
// this is necessary due to some crazy kotlin plugin voodoo. If we define this in the rootProject itself, | ||
// then it does not work. | ||
rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin> { | ||
rootProject.configure<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension> { | ||
lockFileDirectory = rootProject.projectDir.resolve("gradle") | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,6 @@ plugins { | |
id("build-logic.kotlin-jvm-conventions") | ||
} | ||
|
||
|
||
kotlin { | ||
jvm { | ||
// for module-info.java | ||
|
3 changes: 1 addition & 2 deletions
3
...ld-logic/publishing/src/main/kotlin/build-logic.published-kotlin-multiplatform.gradle.kts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
import ch.tutteli.gradle.plugins.publish.PublishPluginExtension | ||
|
||
plugins { | ||
id("build-logic.kotlin-multiplatform") | ||
id("build-logic.dokka") | ||
id("ch.tutteli.gradle.plugins.publish") | ||
id("ch.tutteli.gradle.plugins.kotlin.module.info") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters