Support org.jetbrains.kotlin.js plugin, bump dependencies
#300
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.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
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 |
|---|---|---|
| @@ -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() | ||
| } | ||
| } | ||
|
Comment on lines
+32
to
+37
There was a problem hiding this comment. I have literally zero experience with JS, so the test environment only follows the official documentation |
||
| """.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| plugins { | ||
| kotlin("android") version "1.7.22" | ||
| id("com.android.library") | ||
| id("org.jmailen.kotlinter") | ||
| } | ||
|
|
||
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.22" | ||
| id("org.jmailen.kotlinter") | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I started wondering if this might also work for android project 👀 Theoretically it should, but I'd have to do a bit more research if AGP doesn't do some additional magic