Skip to content

Fix samples tests compilation #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 20, 2023
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
8 changes: 6 additions & 2 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ kotlin.sourceSets {
}

sourceSets {
// Gradle creates configurations and compilation task for each source set
create("samples") {
kotlin.srcDir("src/test/kotlin")
}
Expand Down Expand Up @@ -79,7 +80,10 @@ val samplesImplementation by configurations.getting {
}

val compileSamplesKotlin = tasks.named<KotlinCompile>("compileSamplesKotlin") {
friendPaths.from(sourceSets["main"].output.classesDirs)
tasks.named<KotlinCompile>("compileTestKotlin").get().let {
friendPaths.from(it.friendPaths)
libraries.from(it.libraries)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That explains why it couldn't find the dependencies

}
source(sourceSets["test"].kotlin)
destinationDirectory.set(file("$buildDir/classes/testWithOutputs/kotlin"))
}
Expand All @@ -103,7 +107,7 @@ val clearTestResults by tasks.creating(Delete::class) {

val samplesTest = tasks.register<Test>("samplesTest") {
group = "Verification"
description = "Runs the custom tests."
description = "Runs all samples that are used in the documentation, but modified to save their outputs to a file."

dependsOn(compileSamplesKotlin)
dependsOn(clearTestResults)
Expand Down
12 changes: 6 additions & 6 deletions docs/StardustDocs/topics/joinWith.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ campaigns.innerJoinWith(visits) {

```kotlin
campaigns.innerJoinWith(visits) {
right[{ "date"<LocalDate>() }] in "startDate"<LocalDate>().."endDate"<LocalDate>()
right.getValue<LocalDate>("date") in "startDate"<LocalDate>().."endDate"<LocalDate>()
}
```

Expand Down Expand Up @@ -108,7 +108,7 @@ campaigns.filterJoinWith(visits) {

```kotlin
campaigns.filterJoinWith(visits) {
right[{ "date"<LocalDate>() }] in "startDate"<LocalDate>().."endDate"<LocalDate>()
right.getValue<LocalDate>("date") in "startDate"<LocalDate>().."endDate"<LocalDate>()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, I see Korro indeed works again :D

}
```

Expand Down Expand Up @@ -146,7 +146,7 @@ campaigns.leftJoinWith(visits) {

```kotlin
campaigns.leftJoinWith(visits) {
right[{ "date"<LocalDate>() }] in "startDate"<LocalDate>().."endDate"<LocalDate>()
right.getValue<LocalDate>("date") in "startDate"<LocalDate>().."endDate"<LocalDate>()
}
```

Expand Down Expand Up @@ -184,7 +184,7 @@ campaigns.rightJoinWith(visits) {

```kotlin
campaigns.rightJoinWith(visits) {
right[{ "date"<LocalDate>() }] in "startDate"<LocalDate>().."endDate"<LocalDate>()
right.getValue<LocalDate>("date") in "startDate"<LocalDate>().."endDate"<LocalDate>()
}
```

Expand Down Expand Up @@ -222,7 +222,7 @@ campaigns.fullJoinWith(visits) {

```kotlin
campaigns.fullJoinWith(visits) {
right[{ "date"<LocalDate>() }] in "startDate"<LocalDate>().."endDate"<LocalDate>()
right.getValue<LocalDate>("date") in "startDate"<LocalDate>().."endDate"<LocalDate>()
}
```

Expand Down Expand Up @@ -262,7 +262,7 @@ campaigns.excludeJoinWith(visits) {

```kotlin
campaigns.excludeJoinWith(visits) {
right[{ "date"<LocalDate>() }] in "startDate"<LocalDate>().."endDate"<LocalDate>()
right.getValue<LocalDate>("date") in "startDate"<LocalDate>().."endDate"<LocalDate>()
}
```

Expand Down