Revert "feature add outputs for apiGenerator, stringGenerator"

This reverts commit ab6a83aee0.
This commit is contained in:
Sergey Vlasenko 2024-04-03 14:05:57 +03:00
parent 2ebdc7e33f
commit a8b167af0f
2 changed files with 25 additions and 37 deletions

View File

@ -2,6 +2,7 @@ package apigen
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.kotlin.dsl.create import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.dependencies import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.repositories import org.gradle.kotlin.dsl.repositories
@ -43,39 +44,32 @@ abstract class ApiGeneratorPlugin : Plugin<Project> {
protected fun Project.getExtension(): ApiGeneratorExtension = extensions.getByName(API_GENERATOR_EXT_NAME) as ApiGeneratorExtension protected fun Project.getExtension(): ApiGeneratorExtension = extensions.getByName(API_GENERATOR_EXT_NAME) as ApiGeneratorExtension
private fun Project.createApiGeneratorTask() = tasks.register(API_GENERATOR_CONFIG) { private fun Project.createApiGeneratorTask(): Task = tasks.create(API_GENERATOR_CONFIG).doLast {
val extension = getExtension() val extension = getExtension()
val pathToApiSchemes = extension.pathToApiSchemes ?: throw IllegalStateException("Configure path to api schemes for api generator plugin") val pathToApiSchemes = extension.pathToApiSchemes ?: throw IllegalStateException("Configure path to api schemes for api generator plugin")
val outputLanguage = extension.outputLanguage ?: throw IllegalStateException("Configure output language code for api generator plugin") val outputLanguage = extension.outputLanguage ?: throw IllegalStateException("Configure output language code for api generator plugin")
outputs.files(files(pathToApiSchemes).asFileTree.files) javaexec {
main = "-jar"
doLast { workingDir = rootDir
javaexec { args = listOfNotNull(
mainClass.set("-jar") configurations.getByName("apiGenerator").asPath,
workingDir = rootDir "generate-client-code",
args = listOfNotNull( "--output-language",
"--add-opens", outputLanguage.argName,
"java.base/java.lang=ALL-UNNAMED", "--specification-path",
"--add-opens", pathToApiSchemes,
"java.base/java.time=ALL-UNNAMED", "--kotlin-methods-generation-mode".takeIf { outputLanguage.methodOutputType != null },
configurations.getByName("apiGenerator").asPath, outputLanguage.methodOutputType?.argName,
"generate-client-code", "--output-path",
"--output-language", extension.outputDirPath,
outputLanguage.argName, "--package-name",
"--specification-path", extension.outputPackageName,
pathToApiSchemes, "--recreate_output_dirs",
"--kotlin-methods-generation-mode".takeIf { outputLanguage.methodOutputType != null }, extension.recreateOutputDir.toString()
outputLanguage.methodOutputType?.argName, )
"--output-path",
extension.outputDirPath,
"--package-name",
extension.outputPackageName,
"--recreate_output_dirs",
extension.recreateOutputDir.toString(),
)
}
} }
} }

View File

@ -1,15 +1,9 @@
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import groovy.xml.MarkupBuilder import groovy.xml.MarkupBuilder
tasks.register('stringGenerator') { task stringGenerator {
Map<String, String> sources = android.languageMap generate(android.languageMap, project)
println("Strings generated!")
outputs.files(sources)
doFirst {
generate(sources, project)
println("Strings generated!")
}
} }
private def generate(Map<String, String> sources, Project project) { private def generate(Map<String, String> sources, Project project) {