diff --git a/build.gradle b/build.gradle index 1e9bfea..0e39c16 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,6 @@ ext { description = 'Criteo API Clients Generator' sourceCompatibility = '1.8' jar.enabled = false - gereratedClientsDirName = 'generated-sources' + generatedClientsDirName = 'generated-sources' swaggerSourceList = swaggerList } diff --git a/generator/java/build.gradle b/generator/java/build.gradle index fb5eb6c..baefa88 100644 --- a/generator/java/build.gradle +++ b/generator/java/build.gradle @@ -13,7 +13,7 @@ buildscript { apply plugin: 'org.openapi.generator' -def clientOutputDir = "$projectDir/../../$rootProject.gereratedClientsDirName/java".toString() +def clientOutputDir = "$rootDir/$rootProject.generatedClientsDirName/java" def buildDir = "$projectDir/build"; def resourcesDir = "$projectDir/resources".toString() def criteoPackage = project.properties["package.name.base"] @@ -38,9 +38,6 @@ task generateClient(type: GradleBuild) { def taskList = []; rootProject.swaggerSourceList.each { - def jsonFile = file(it.path); - def parsedJson = new groovy.json.JsonSlurper().parseText(jsonFile.text); - def parsedApiName = it.getName().replace(".json", "").toLowerCase(); def (criteoService, apiVersionFromName) = parsedApiName.tokenize('_'); def criteoApiVersion = apiVersionFromName.replace('-', '_'); diff --git a/generator/php/build.gradle b/generator/php/build.gradle index 883dfd7..3c1d037 100644 --- a/generator/php/build.gradle +++ b/generator/php/build.gradle @@ -17,7 +17,7 @@ ext { jar.enabled = false } -def clientOutputDir = "$projectDir/../../$rootProject.gereratedClientsDirName/php".toString() +def clientOutputDir = "$rootDir/$rootProject.generatedClientsDirName/php" def resourcesDir = "$projectDir/resources".toString() def criteoPackage = project.properties["package.name.base"] def generatorVersion = project.properties["generator.version"] @@ -40,9 +40,6 @@ task generateClient(type: GradleBuild) { def taskList = ['cleanPreviousDist']; rootProject.swaggerSourceList.each { - def jsonFile = file(it.path); - def parsedJson = new groovy.json.JsonSlurper().parseText(jsonFile.text); - def parsedApiName = it.getName().replace(".json", "").toLowerCase(); def (criteoService, apiVersionFromName) = parsedApiName.tokenize('_'); def criteoApiVersion = apiVersionFromName.replace('-', '_'); diff --git a/generator/python/build.gradle b/generator/python/build.gradle index 05d1d26..c3bd074 100644 --- a/generator/python/build.gradle +++ b/generator/python/build.gradle @@ -18,7 +18,7 @@ ext { jar.enabled = false } -def clientOutputDir = "$projectDir/../../$rootProject.gereratedClientsDirName/python".toString() +def clientOutputDir = "$rootDir/$rootProject.generatedClientsDirName/python" def resourcesDir = "$projectDir/resources".toString() def buildDir = "$projectDir/build" def criteoPackage = project.properties["package.name.base"] @@ -42,9 +42,6 @@ task generateClient(type: GradleBuild) { def taskList = ['cleanPreviousDist']; rootProject.swaggerSourceList.each { - def jsonFile = file(it.path); - def parsedJson = new groovy.json.JsonSlurper().parseText(jsonFile.text); - def parsedApiName = it.getName().replace(".json", "").toLowerCase(); def taskSuffix = language + "_" + parsedApiName def (criteoService, apiVersionFromName) = parsedApiName.tokenize('_');