Skip to content

Fix flankAuth task compatibility with Gradle configuration cache (#381) #465

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix flankAuth task compatibility with Gradle configuration cache (#381) #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions fladle-plugin/src/main/java/com/osacky/flank/gradle/FladlePluginDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ class FladlePluginDelegate {
val extension = target.extensions.create<FlankGradleExtension>("fladle", target.objects)

target.tasks.register("flankAuth", FlankJavaExec::class.java) {
val fladleConfig = target.configurations.getByName(FLADLE_CONFIG)
val fladleDir = target.layout.buildDirectory.dir("fladle")
doFirst {
target.layout.fladleDir.get().asFile.mkdirs()
fladleDir.get().asFile.mkdirs()
}
classpath = project.fladleConfig
classpath = fladleConfig
args = listOf("auth", "login")
}

Expand Down
4 changes: 2 additions & 2 deletions fladle-plugin/src/main/java/com/osacky/flank/gradle/FlankJavaExec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import javax.inject.Inject
)
open class FlankJavaExec
@Inject
constructor(projectLayout: ProjectLayout) : JavaExec() {
constructor(private val projectLayout: ProjectLayout) : JavaExec() {
init {
group = FladlePluginDelegate.TASK_GROUP
mainClass.set("ftl.Main")
workingDir(projectLayout.fladleDir)
}

fun setUpWorkingDir(configName: String) = workingDir(project.layout.buildDirectory.dir("fladle/$configName"))
fun setUpWorkingDir(configName: String) = workingDir(projectLayout.buildDirectory.dir("fladle/$configName"))
}
24 changes: 24 additions & 0 deletions fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/ConfigurationCacheTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,30 @@ class ConfigurationCacheTest {
assertThat(secondResult.output).contains("Reusing configuration cache.")
}

@Test
fun flankAuth() {
writeBuildGradle(
"""|plugins {
| id "com.osacky.fladle"
|}
|
|repositories {
| mavenCentral()
|}
|
""".trimMargin(),
)
val result = configCachingRunner("flankAuth").buildAndFail()

assertThat(result.output).contains("Address already in use")
assertThat(result.output).contains("Configuration cache entry stored.")

val secondResult = configCachingRunner("flankAuth").buildAndFail()

assertThat(secondResult.output).contains("Address already in use")
assertThat(secondResult.output).contains("Reusing configuration cache.")
}

@Test
fun runFlank() {
writeBuildGradle(
Expand Down
Loading