Skip to content

Make plugin work under Gradle 7 #46

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.

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

Merged
merged 1 commit into from
Apr 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package org.springdoc.openapi.gradle.plugin

import com.github.jengelman.gradle.plugins.processes.tasks.Fork
import groovy.lang.MetaClass
import org.codehaus.groovy.runtime.InvokerHelper
import org.gradle.api.tasks.Internal
import org.gradle.process.CommandLineArgumentProvider

/**
* Extends the Fork task from the gradle-processes plugin to be compatible with Gradle 7.
* The functionality of the class remains exactly the same; it was just missing an annotation
* on the [getArgumentProviders] method and the annotation is mandatory in Gradle 7.
*
* Since the original class is written in Groovy, we also need to implement some internal
* Groovy methods that get added to Groovy classes via bytecode manipulation.
*/
open class AnnotatedFork : Fork() {
private var metaClass: MetaClass? = null

override fun invokeMethod(method: String?, args: Any?): Any? {
return InvokerHelper.invokeMethod(this, method, args)
}

override fun getProperty(property: String?): Any? {
return InvokerHelper.getProperty(this, property)
}

override fun getMetaClass(): MetaClass? {
if (metaClass == null) {
metaClass = InvokerHelper.getMetaClass(javaClass)
}
return metaClass
}

override fun setMetaClass(newMetaClass: MetaClass?) {
metaClass = newMetaClass
}

@Internal
override fun getArgumentProviders(): MutableList<CommandLineArgumentProvider>? {
return super.getArgumentProviders()
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.springdoc.openapi.gradle.plugin

import com.github.jengelman.gradle.plugins.processes.tasks.Fork
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.logging.Logging
Expand All @@ -26,7 +25,7 @@ open class OpenApiGradlePlugin : Plugin<Project> {
}

// Create a forked version spring boot run task
val forkedSpringBoot = project.tasks.register(FORKED_SPRING_BOOT_RUN_TASK_NAME, Fork::class.java) { fork ->
val forkedSpringBoot = project.tasks.register(FORKED_SPRING_BOOT_RUN_TASK_NAME, AnnotatedFork::class.java) { fork ->
fork.dependsOn(bootJarTask)

fork.onlyIf {
Expand Down