Compare commits

..

4 Commits

Author SHA1 Message Date
Vlad 7997a2344a Add skip_metadata 2021-04-13 13:17:49 +03:00
Vlad 46b3f75447 Add skip_screenshots 2021-04-13 13:15:42 +03:00
Vlad 31b2941ede Add skip_app_version_update param 2021-04-13 12:35:54 +03:00
Vlad f36e5669f1 Fix path to envsubst for read_input_file_names.sh 2021-04-02 17:01:51 +03:00
7 changed files with 17 additions and 14 deletions
@@ -12,14 +12,14 @@ abstract class ApiGeneratorPlugin : Plugin<Project> {
companion object {
const val API_GENERATOR_CONFIG = "apiGenerator"
const val API_GENERATOR_EXT_NAME = "apiGenerator"
const val API_GENERATOR_DEFAULT_VERSION = "1.4.0-beta10"
const val API_GENERATOR_DEFAULT_VERSION = "1.4.0-beta5"
}
override fun apply(target: Project) {
with(target) {
repositories {
maven {
url = uri("https://maven.dev.touchin.ru")
url = uri("https://dl.bintray.com/touchin/touchin-tools")
metadataSources {
artifact()
}
@@ -34,9 +34,9 @@ class StaticAnalysisAndroidPlugin : StaticAnalysisPlugin() {
}
}
//TODO: return CpdLinter after finding better way to disable it
override fun createLinters(): List<Linter> = listOf(
DetektLinter(),
CpdLinter(),
AndroidLinter()
)
+1 -1
View File
@@ -135,7 +135,7 @@ fi
mkdir -p ${OUTPUT_PATH}
# download api generator
readonly DOWNLOAD_URL="https://maven.dev.touchin.ru/ru/touchin/api-generator/${VERSION}/${FILE_NAME}"
readonly DOWNLOAD_URL="https://dl.bintray.com/touchin/touchin-tools/ru/touchin/api-generator/${VERSION}/${FILE_NAME}"
. build-scripts/xcode/aux_scripts/download_file.sh ${FILE_NAME} ${DOWNLOAD_URL}
# execute api generator
@@ -47,6 +47,8 @@ if [ -z "${DEFAULT_FILE_NAMES}" ]; then
fi
fi
readonly envsubst="/usr/local/bin/envsubst"
INPUT_FILE_NAMES=""
if has_input_files && has_input_file_lists; then
@@ -60,7 +62,7 @@ if has_input_files && \
do
SCRIPT_INPUT_FILE_VARIABLE_NAME="SCRIPT_INPUT_FILE_${i}"
SHELL_VARIABLE="\${${SCRIPT_INPUT_FILE_VARIABLE_NAME}}"
RESOLVED_FILE_NAME=`envsubst <<< ${SHELL_VARIABLE}`
RESOLVED_FILE_NAME=`$envsubst <<< ${SHELL_VARIABLE}`
INPUT_FILE_NAMES=${INPUT_FILE_NAMES}${FILE_NAMES_SEPARATOR}${RESOLVED_FILE_NAME}
done
@@ -77,8 +79,8 @@ elif has_input_file_lists; then
do
SCRIPT_INPUT_FILE_LIST_VARIABLE_NAME="SCRIPT_INPUT_FILE_LIST_${i}"
SHELL_VARIABLE="\${${SCRIPT_INPUT_FILE_LIST_VARIABLE_NAME}}"
FILE_NAME=`envsubst <<< ${SHELL_VARIABLE}`
RESOLVED_FILE_NAMES=`envsubst < ${FILE_NAME}`
FILE_NAME=`$envsubst <<< ${SHELL_VARIABLE}`
RESOLVED_FILE_NAMES=`$envsubst < ${FILE_NAME}`
for INPUT_FILE_NAME in ${RESOLVED_FILE_NAMES}; do
INPUT_FILE_NAMES=${INPUT_FILE_NAMES}${INPUT_FILE_NAME}${FILE_NAMES_SEPARATOR}
+2 -2
View File
@@ -24,7 +24,7 @@
readonly EXIT_SUCCESS=0
readonly EXIT_FAILURE=1
if which pmd >/dev/null; then
if which /usr/local/bin/pmd >/dev/null; then
readonly REPORTS_DIR="${PROJECT_DIR}/code-quality-reports"
readonly SOURCES_DIRS=`. ${SCRIPT_DIR}/common/read_input_file_names.sh " " ${PROJECT_DIR}`
@@ -44,7 +44,7 @@ if which pmd >/dev/null; then
mkdir -p ${REPORTS_DIR}
pmd cpd --files ${SOURCES_DIRS} --exclude ${FILES_TO_EXCLUDE} --minimum-tokens 50 --language swift --encoding UTF-8 --format net.sourceforge.pmd.cpd.XMLRenderer --failOnViolation true > ${REPORTS_DIR}/cpd-output.xml
/usr/local/bin/pmd cpd --files ${SOURCES_DIRS} --exclude ${FILES_TO_EXCLUDE} --minimum-tokens 50 --language swift --encoding UTF-8 --format net.sourceforge.pmd.cpd.XMLRenderer --failOnViolation true > ${REPORTS_DIR}/cpd-output.xml
php ${SCRIPT_DIR}/../aux_scripts/cpd_script.php ${REPORTS_DIR}/cpd-output.xml | tee ${REPORTS_DIR}/CPDLog.txt
+3
View File
@@ -55,6 +55,9 @@ def upload_to_app_store_using_options(options)
ipa: options[:ipa_path],
force: true, # skip metainfo prompt
skip_metadata: true,
skip_app_version_update: true,
skip_screenshots: true,
skip_metadata: true,
team_id: options[:itc_team_id],
dev_portal_team_id: options[:team_id],
precheck_include_in_app_purchases: false
@@ -42,6 +42,8 @@ module Touchlane
# Those doesn't mean they're new, it might just be they're changed
# Either way, we'll upload them using the same technique
Dir.mkdir(self.signing_identities_path) unless File.exists?(self.signing_identities_path)
files_to_upload.each do |current_file|
# Go from
# "/var/folders/px/bz2kts9n69g8crgv4jpjh6b40000gn/T/d20181026-96528-1av4gge/profiles/development/Development_me.mobileprovision"
@@ -51,11 +53,7 @@ module Touchlane
# We also have to remove the trailing `/` as Google Cloud doesn't handle it nicely
target_path = current_file.gsub(self.working_directory + "/", "")
absolute_target_path = File.join(self.signing_identities_path, target_path)
FileUtils.mkdir_p(File.dirname(absolute_target_path))
FileUtils.cp_r(current_file, absolute_target_path, remove_destination: true)
FileUtils.cp_r(current_file, File.join(self.signing_identities_path, target_path), remove_destination: true)
end
end