Skip to content

Commit

Permalink
Merge pull request #12 from aafanasev/update-kotlin-1.3.72
Browse files Browse the repository at this point in the history
Update Kotlin version to 1.3.72
  • Loading branch information
aafanasev authored Jun 21, 2020
2 parents 8f82270 + b392fb6 commit e4dd32d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Run tests
run: ./gradlew test --stacktrace
run: ./gradlew test --info
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.3.40" apply false
kotlin("jvm") version "1.3.72" apply false
}

allprojects {
Expand All @@ -19,4 +19,4 @@ subprojects {
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
}
}
}
10 changes: 1 addition & 9 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,11 @@ tasks.withType<KotlinCompile> {
kotlinOptions {
freeCompilerArgs = listOf("-Xplugin=${project(kotlinPlugin).buildDir}/libs/kotlin-plugin-$version.jar")
}
dependsOn(project(kotlinPlugin).getTasksByName("build", false))
}

tasks.withType<Test> {
useJUnitPlatform {
includeEngines("spek2")
}
}

tasks {
"run" {
dependsOn(project(kotlinPlugin).getTasksByName("build", false))
}
"test" {
dependsOn(project(kotlinPlugin).getTasksByName("build", false))
}
}

0 comments on commit e4dd32d

Please sign in to comment.