From cde3d783fa3e3bc86b5b17f17a22ab4fa3887150 Mon Sep 17 00:00:00 2001 From: Goooler Date: Thu, 9 Jan 2025 13:17:59 +0800 Subject: [PATCH] Reduce extra doc package in intiTest --- .../plugins/shadow/{doc => }/DocCodeSnippetTest.kt | 10 +++++----- .../plugins/shadow/doc/executor/SnippetExecutor.kt | 10 ---------- .../plugins/shadow/doc/fixture/SnippetFixture.kt | 5 ----- .../{doc => }/executable/CodeSnippetExecutable.kt | 4 ++-- .../{doc => }/executable/CodeSnippetExtractor.kt | 6 +++--- .../shadow/{doc => }/executor/GroovyBuildExecutor.kt | 4 ++-- .../plugins/shadow/{doc => }/executor/NoopExecutor.kt | 4 ++-- .../gradle/plugins/shadow/executor/SnippetExecutor.kt | 10 ++++++++++ .../shadow/{doc => }/fixture/GroovyDslFixture.kt | 2 +- .../gradle/plugins/shadow/fixture/SnippetFixture.kt | 5 +++++ 10 files changed, 30 insertions(+), 30 deletions(-) rename src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/{doc => }/DocCodeSnippetTest.kt (67%) delete mode 100644 src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/SnippetExecutor.kt delete mode 100644 src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/SnippetFixture.kt rename src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/{doc => }/executable/CodeSnippetExecutable.kt (81%) rename src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/{doc => }/executable/CodeSnippetExtractor.kt (92%) rename src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/{doc => }/executor/GroovyBuildExecutor.kt (92%) rename src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/{doc => }/executor/NoopExecutor.kt (61%) create mode 100644 src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt rename src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/{doc => }/fixture/GroovyDslFixture.kt (90%) create mode 100644 src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/DocCodeSnippetTest.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/DocCodeSnippetTest.kt similarity index 67% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/DocCodeSnippetTest.kt rename to src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/DocCodeSnippetTest.kt index 887c4a273..76363f9c4 100644 --- a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/DocCodeSnippetTest.kt +++ b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/DocCodeSnippetTest.kt @@ -1,9 +1,9 @@ -package com.github.jengelman.gradle.plugins.shadow.doc +package com.github.jengelman.gradle.plugins.shadow -import com.github.jengelman.gradle.plugins.shadow.doc.executable.CodeSnippetExtractor -import com.github.jengelman.gradle.plugins.shadow.doc.executor.GroovyBuildExecutor -import com.github.jengelman.gradle.plugins.shadow.doc.executor.NoopExecutor -import com.github.jengelman.gradle.plugins.shadow.doc.fixture.GroovyDslFixture +import com.github.jengelman.gradle.plugins.shadow.executable.CodeSnippetExtractor +import com.github.jengelman.gradle.plugins.shadow.executor.GroovyBuildExecutor +import com.github.jengelman.gradle.plugins.shadow.executor.NoopExecutor +import com.github.jengelman.gradle.plugins.shadow.fixture.GroovyDslFixture import java.nio.file.Path import kotlin.io.path.Path import org.junit.jupiter.api.DynamicTest diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/SnippetExecutor.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/SnippetExecutor.kt deleted file mode 100644 index 09f87c315..000000000 --- a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/SnippetExecutor.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.jengelman.gradle.plugins.shadow.doc.executor - -import com.github.jengelman.gradle.plugins.shadow.doc.fixture.SnippetFixture -import java.nio.file.Path - -interface SnippetExecutor { - val fixture: SnippetFixture - - fun execute(tempDir: Path, snippet: String) -} diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/SnippetFixture.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/SnippetFixture.kt deleted file mode 100644 index 8a20af065..000000000 --- a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/SnippetFixture.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.jengelman.gradle.plugins.shadow.doc.fixture - -interface SnippetFixture { - val pre: String -} diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executable/CodeSnippetExecutable.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExecutable.kt similarity index 81% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executable/CodeSnippetExecutable.kt rename to src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExecutable.kt index 7a734b6b3..0eaf65ad6 100644 --- a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executable/CodeSnippetExecutable.kt +++ b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExecutable.kt @@ -1,6 +1,6 @@ -package com.github.jengelman.gradle.plugins.shadow.doc.executable +package com.github.jengelman.gradle.plugins.shadow.executable -import com.github.jengelman.gradle.plugins.shadow.doc.executor.SnippetExecutor +import com.github.jengelman.gradle.plugins.shadow.executor.SnippetExecutor import java.nio.file.Path import kotlin.io.path.createTempDirectory import org.junit.jupiter.api.function.Executable diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executable/CodeSnippetExtractor.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExtractor.kt similarity index 92% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executable/CodeSnippetExtractor.kt rename to src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExtractor.kt index 334cdee26..650fb9554 100644 --- a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executable/CodeSnippetExtractor.kt +++ b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executable/CodeSnippetExtractor.kt @@ -1,7 +1,7 @@ -package com.github.jengelman.gradle.plugins.shadow.doc.executable +package com.github.jengelman.gradle.plugins.shadow.executable -import com.github.jengelman.gradle.plugins.shadow.doc.DocCodeSnippetTest -import com.github.jengelman.gradle.plugins.shadow.doc.executor.SnippetExecutor +import com.github.jengelman.gradle.plugins.shadow.DocCodeSnippetTest +import com.github.jengelman.gradle.plugins.shadow.executor.SnippetExecutor import java.nio.file.Path import java.util.regex.Pattern import kotlin.io.path.ExperimentalPathApi diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/GroovyBuildExecutor.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/GroovyBuildExecutor.kt similarity index 92% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/GroovyBuildExecutor.kt rename to src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/GroovyBuildExecutor.kt index 556f93fb2..fbe45440d 100644 --- a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/GroovyBuildExecutor.kt +++ b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/GroovyBuildExecutor.kt @@ -1,6 +1,6 @@ -package com.github.jengelman.gradle.plugins.shadow.doc.executor +package com.github.jengelman.gradle.plugins.shadow.executor -import com.github.jengelman.gradle.plugins.shadow.doc.fixture.SnippetFixture +import com.github.jengelman.gradle.plugins.shadow.fixture.SnippetFixture import java.nio.file.Path import kotlin.io.path.createDirectory import kotlin.io.path.writeText diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/NoopExecutor.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/NoopExecutor.kt similarity index 61% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/NoopExecutor.kt rename to src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/NoopExecutor.kt index 3820b8aef..1123baddb 100644 --- a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/executor/NoopExecutor.kt +++ b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/NoopExecutor.kt @@ -1,6 +1,6 @@ -package com.github.jengelman.gradle.plugins.shadow.doc.executor +package com.github.jengelman.gradle.plugins.shadow.executor -import com.github.jengelman.gradle.plugins.shadow.doc.fixture.SnippetFixture +import com.github.jengelman.gradle.plugins.shadow.fixture.SnippetFixture import java.nio.file.Path object NoopExecutor : SnippetExecutor { diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt new file mode 100644 index 000000000..0b445e007 --- /dev/null +++ b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/executor/SnippetExecutor.kt @@ -0,0 +1,10 @@ +package com.github.jengelman.gradle.plugins.shadow.executor + +import com.github.jengelman.gradle.plugins.shadow.fixture.SnippetFixture +import java.nio.file.Path + +interface SnippetExecutor { + val fixture: SnippetFixture + + fun execute(tempDir: Path, snippet: String) +} diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/GroovyDslFixture.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/GroovyDslFixture.kt similarity index 90% rename from src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/GroovyDslFixture.kt rename to src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/GroovyDslFixture.kt index e7dacf74d..525dbce85 100644 --- a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/doc/fixture/GroovyDslFixture.kt +++ b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/GroovyDslFixture.kt @@ -1,4 +1,4 @@ -package com.github.jengelman.gradle.plugins.shadow.doc.fixture +package com.github.jengelman.gradle.plugins.shadow.fixture object GroovyDslFixture : SnippetFixture { diff --git a/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt new file mode 100644 index 000000000..95a2ebf5d --- /dev/null +++ b/src/intiTest/kotlin/com/github/jengelman/gradle/plugins/shadow/fixture/SnippetFixture.kt @@ -0,0 +1,5 @@ +package com.github.jengelman.gradle.plugins.shadow.fixture + +interface SnippetFixture { + val pre: String +}