Compare commits
3 Commits
master
...
feature/RE
| Author | SHA1 | Date |
|---|---|---|
|
|
d4d0d1b75d | |
|
|
60b1e4a3e9 | |
|
|
d6315b283d |
|
|
@ -52,7 +52,7 @@ abstract class ApiGeneratorPlugin : Plugin<Project> {
|
||||||
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")
|
||||||
|
|
||||||
javaexec {
|
javaexec {
|
||||||
main = "-jar"
|
mainClass.set("-jar")
|
||||||
workingDir = rootDir
|
workingDir = rootDir
|
||||||
args = listOfNotNull(
|
args = listOfNotNull(
|
||||||
configurations.getByName("apiGenerator").asPath,
|
configurations.getByName("apiGenerator").asPath,
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ class SwaggerApiGeneratorAndroidPlugin : Plugin<Project> {
|
||||||
workingDir = file(taskWorkingDir)
|
workingDir = file(taskWorkingDir)
|
||||||
classpath = files(configurations.getByName(GENERATOR_CONFIG).asPath,
|
classpath = files(configurations.getByName(GENERATOR_CONFIG).asPath,
|
||||||
configurations.getByName(TI_GENERATOR_CONFIG).asPath)
|
configurations.getByName(TI_GENERATOR_CONFIG).asPath)
|
||||||
main = "io.swagger.codegen.v3.cli.SwaggerCodegen"
|
mainClass.set("io.swagger.codegen.v3.cli.SwaggerCodegen")
|
||||||
args = listOfNotNull(
|
args = listOfNotNull(
|
||||||
"generate",
|
"generate",
|
||||||
"-i",
|
"-i",
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ class CpdLinter : Linter {
|
||||||
}
|
}
|
||||||
tasks.withType<Cpd> {
|
tasks.withType<Cpd> {
|
||||||
reports.xml.required.set(true)
|
reports.xml.required.set(true)
|
||||||
reports.xml.destination = getCpdReportFile()
|
reports.xml.outputLocation.set(getCpdReportFile())
|
||||||
ignoreFailures = true
|
ignoreFailures = true
|
||||||
source = getSources(extension.excludes)
|
source = getSources(extension.excludes)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ import groovy.json.JsonSlurper
|
||||||
import groovy.xml.MarkupBuilder
|
import groovy.xml.MarkupBuilder
|
||||||
|
|
||||||
task stringGenerator {
|
task stringGenerator {
|
||||||
generate(android.languageMap, project)
|
generate(android.languageMap, project.rootProject.findProject(":core:strings"))
|
||||||
println("Strings generated!")
|
println("Strings generated!")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -32,6 +32,11 @@ private def generate(Map<String, String> sources, Project project) {
|
||||||
}
|
}
|
||||||
|
|
||||||
def stringsFile = getFile(key, key == defaultLang, project)
|
def stringsFile = getFile(key, key == defaultLang, project)
|
||||||
|
if (!stringsFile.exists()) {
|
||||||
|
stringsFile.parentFile.mkdirs()
|
||||||
|
stringsFile.createNewFile()
|
||||||
|
}
|
||||||
|
|
||||||
stringsFile.write(sw.toString(), "UTF-8")
|
stringsFile.write(sw.toString(), "UTF-8")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit a8f072f216684bd7f5563c0211f71d6637a5f92d
|
Subproject commit e591d65722d78918c84c4eeda3df8c4012e75323
|
||||||
|
|
@ -3,15 +3,13 @@ module Touchlane
|
||||||
DEVELOPMENT = "development"
|
DEVELOPMENT = "development"
|
||||||
ENTERPRISE = "enterprise"
|
ENTERPRISE = "enterprise"
|
||||||
APP_STORE = "appstore"
|
APP_STORE = "appstore"
|
||||||
ADHOC = "adhoc"
|
|
||||||
|
|
||||||
DEVELOPMENT_PREFIX = "Standard"
|
DEVELOPMENT_PREFIX = "Standard"
|
||||||
ENTERPRISE_PREFIX = "Enterprise"
|
ENTERPRISE_PREFIX = "Enterprise"
|
||||||
APP_STORE_PREFIX = "AppStore"
|
APP_STORE_PREFIX = "AppStore"
|
||||||
ADHOC_PREFIX = "AdHoc"
|
|
||||||
|
|
||||||
private_constant :DEVELOPMENT, :ENTERPRISE, :APP_STORE, :ADHOC_PREFIX
|
private_constant :DEVELOPMENT, :ENTERPRISE, :APP_STORE
|
||||||
private_constant :DEVELOPMENT_PREFIX, :ENTERPRISE_PREFIX, :APP_STORE_PREFIX, :ADHOC_PREFIX
|
private_constant :DEVELOPMENT_PREFIX, :ENTERPRISE_PREFIX, :APP_STORE_PREFIX
|
||||||
|
|
||||||
def initialize(type)
|
def initialize(type)
|
||||||
@type = type
|
@type = type
|
||||||
|
|
@ -32,10 +30,6 @@ module Touchlane
|
||||||
@export_method = "app-store"
|
@export_method = "app-store"
|
||||||
@configuration = "AppStore"
|
@configuration = "AppStore"
|
||||||
@prefix = APP_STORE_PREFIX
|
@prefix = APP_STORE_PREFIX
|
||||||
when ADHOC
|
|
||||||
@export_method = type
|
|
||||||
@export_method = "ad-hoc"
|
|
||||||
@prefix = ADHOC_PREFIX
|
|
||||||
else
|
else
|
||||||
raise "Unknown type passed #{type}"
|
raise "Unknown type passed #{type}"
|
||||||
end
|
end
|
||||||
|
|
@ -53,11 +47,9 @@ module Touchlane
|
||||||
from_type(APP_STORE)
|
from_type(APP_STORE)
|
||||||
when lane_name.start_with?(DEVELOPMENT_PREFIX)
|
when lane_name.start_with?(DEVELOPMENT_PREFIX)
|
||||||
from_type(DEVELOPMENT)
|
from_type(DEVELOPMENT)
|
||||||
when lane_name.start_with?(ADHOC_PREFIX)
|
|
||||||
from_type(ADHOC)
|
|
||||||
else
|
else
|
||||||
raise "Unable to map #{lane_name} to #{ConfigurationType.class}."
|
raise "Unable to map #{lane_name} to #{ConfigurationType.class}."
|
||||||
+ "Available prefixes: #{DEVELOPMENT_PREFIX}, #{ENTERPRISE_PREFIX}, #{APP_STORE_PREFIX}, #{ADHOC_PREFIX}"
|
+ "Available prefixes: #{DEVELOPMENT_PREFIX}, #{ENTERPRISE_PREFIX}, #{APP_STORE_PREFIX}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -73,11 +65,9 @@ module Touchlane
|
||||||
from_type(ENTERPRISE)
|
from_type(ENTERPRISE)
|
||||||
when APP_STORE_PREFIX
|
when APP_STORE_PREFIX
|
||||||
from_type(APP_STORE)
|
from_type(APP_STORE)
|
||||||
when ADHOC_PREFIX
|
|
||||||
from_type(ADHOC)
|
|
||||||
else
|
else
|
||||||
raise "Unable to map #{account_type} to #{ConfigurationType.class}."
|
raise "Unable to map #{account_type} to #{ConfigurationType.class}."
|
||||||
+ "Available account types: #{DEVELOPMENT_PREFIX}, #{ENTERPRISE_PREFIX}, #{APP_STORE_PREFIX}, #{ADHOC_PREFIX}"
|
+ "Available account types: #{DEVELOPMENT_PREFIX}, #{ENTERPRISE_PREFIX}, #{APP_STORE_PREFIX}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue