Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support
org.jetbrains.kotlin.js plugin, bump dependencies (#300)
- Loading branch information
1 parent
7e9c97b
commit 99e6606
Showing
11 changed files
with
140 additions
and
45 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
Binary file not shown.
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,5 +1,6 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip | ||
| networkTimeout=10000 | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
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
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
23 changes: 0 additions & 23 deletions
23
.../kotlin/org/jmailen/gradle/kotlinter/pluginapplier/KotlinMultiplatformSourceSetApplier.kt
This file was deleted.
Oops, something went wrong.
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
115 changes: 115 additions & 0 deletions
115
src/test/kotlin/org/jmailen/gradle/kotlinter/functional/KotlinJsProjectTest.kt
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,115 @@ | ||
| package org.jmailen.gradle.kotlinter.functional | ||
|
|
||
| import org.gradle.testkit.runner.TaskOutcome | ||
| import org.jmailen.gradle.kotlinter.functional.utils.kotlinClass | ||
| import org.jmailen.gradle.kotlinter.functional.utils.resolve | ||
| import org.jmailen.gradle.kotlinter.functional.utils.settingsFile | ||
| import org.junit.jupiter.api.Assertions.assertEquals | ||
| import org.junit.jupiter.api.Assertions.assertTrue | ||
| import org.junit.jupiter.api.BeforeEach | ||
| import org.junit.jupiter.api.Test | ||
| import java.io.File | ||
|
|
||
| class KotlinJsProjectTest : WithGradleTest.Kotlin() { | ||
|
|
||
| lateinit var projectRoot: File | ||
|
|
||
| @BeforeEach | ||
| fun setup() { | ||
| projectRoot = testProjectDir.apply { | ||
| resolve("settings.gradle") { writeText(settingsFile) } | ||
| resolve("build.gradle") { | ||
| // language=groovy | ||
| writeText( | ||
| """ | ||
| plugins { | ||
| id 'org.jetbrains.kotlin.js' | ||
| id 'org.jmailen.kotlinter' | ||
| } | ||
| repositories.mavenCentral() | ||
| kotlin { | ||
| js { | ||
| browser() | ||
| binaries.executable() | ||
| } | ||
| } | ||
| """.trimIndent(), | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `lintKotlin passes when on valid kotlin files`() { | ||
| projectRoot.resolve("src/main/kotlin/FixtureFileName.kt") { | ||
| writeText(kotlinClass("FixtureFileName")) | ||
| } | ||
| projectRoot.resolve("src/test/kotlin/TestFileName.kt") { | ||
| writeText(kotlinClass("TestFileName")) | ||
| } | ||
|
|
||
| build("lintKotlin").apply { | ||
| assertEquals(TaskOutcome.SUCCESS, task(":lintKotlinMain")?.outcome) | ||
| assertEquals(TaskOutcome.SUCCESS, task(":lintKotlinTest")?.outcome) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `lintKotlin fails when lint errors detected`() { | ||
| projectRoot.resolve("src/main/kotlin/FixtureFileName.kt") { | ||
| writeText(kotlinClass("DifferentClassName")) | ||
| } | ||
| projectRoot.resolve("src/test/kotlin/FixtureTestFileName.kt") { | ||
| writeText(kotlinClass("DifferentTestClassName")) | ||
| } | ||
|
|
||
| buildAndFail("lintKotlin", "--continue").apply { | ||
| assertEquals(TaskOutcome.FAILED, task(":lintKotlinMain")?.outcome) | ||
| assertTrue(output.contains("Lint error > [filename] File 'FixtureFileName.kt' contains a single top level declaration")) | ||
| assertEquals(TaskOutcome.FAILED, task(":lintKotlinTest")?.outcome) | ||
| assertTrue(output.contains("Lint error > [filename] File 'FixtureTestFileName.kt' contains a single top level declaration")) | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `formatKotlin reports formatted and unformatted files`() { | ||
| projectRoot.resolve("src/main/kotlin/FixtureClass.kt") { | ||
| // language=kotlin | ||
| val kotlinClass = | ||
| """ | ||
| import System.* | ||
| class FixtureClass{ | ||
| private fun hi() { | ||
| out.println("Hello") | ||
| } | ||
| } | ||
| """.trimIndent() | ||
| writeText(kotlinClass) | ||
| } | ||
| projectRoot.resolve("src/test/kotlin/FixtureTestClass.kt") { | ||
| // language=kotlin | ||
| val kotlinClass = | ||
| """ | ||
| import System.* | ||
| class FixtureTestClass{ | ||
| private fun hi() { | ||
| out.println("Hello") | ||
| } | ||
| } | ||
| """.trimIndent() | ||
| writeText(kotlinClass) | ||
| } | ||
| build("formatKotlin").apply { | ||
| assertEquals(TaskOutcome.SUCCESS, task(":formatKotlinMain")?.outcome) | ||
| assertTrue(output.contains("FixtureClass.kt:3:19: Format fixed > [curly-spacing] Missing spacing before \"{\"")) | ||
| assertTrue(output.contains("FixtureClass.kt:1:1: Format could not fix > [no-wildcard-imports] Wildcard import")) | ||
| assertEquals(TaskOutcome.SUCCESS, task(":formatKotlinTest")?.outcome) | ||
| assertTrue(output.contains("FixtureTestClass.kt:3:23: Format fixed > [curly-spacing] Missing spacing before \"{\"")) | ||
| assertTrue(output.contains("FixtureTestClass.kt:1:1: Format could not fix > [no-wildcard-imports] Wildcard import")) | ||
| } | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| plugins { | ||
| kotlin("jvm") version "1.7.20" | ||
| kotlin("jvm") version "1.7.22" | ||
| id("org.jmailen.kotlinter") | ||
| } |