TouchInstinct
/
BuildScripts
304
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Подлитие мастера в Licard-dev #3

Closed
bogdan.terehov wants to merge 0 commits from merge_master_in_licard_dev into licard-dev
pull from: merge_master_in_licard_dev
merge into: TouchInstinct:licard-dev
Conversation 0 Commits - Files Changed - +3313 -2178
bogdan.terehov commented 2023-04-20 22:42:27 +03:00
Member
Copy Link
No description provided.
bogdan.terehov added 310 commits 2023-04-20 22:42:28 +03:00
64e9c6182e Merge remote-tracking branch 'origin/master' into gradle/plugins 
# Conflicts:
#	proguard/common.pro
#	proguard/rules/moshi.pro
bc240b7886
Merge pull request #223 from TouchInstinct/gradle/plugins 
Create gradle kotlin plugins for Static Analysis and Api Generator
95e915c003
Merge pull request #238 from TouchInstinct/fix/redundant_boolean_condition 
disable comments evaluation for redundant_boolean_condition rule
7a91383726
Merge pull request #237 from TouchInstinct/feature/feature_toggles 
Add generateFeaturesFile lane and feature generator
b77b2288f2
Merge pull request #239 from TouchInstinct/fix/generated_exclude 
add Generated, as well as **/Generated (for multiple swiftlint)
bd19a47a75 Update feature toggles work 
Add templates
Add template manager
Updaet features generation scripts
54fd9f1106
Merge pull request #243 from TouchInstinct/feature/fastlane_app_store_connect_api 
use App Store Connect API for match and upload_to_app_store
5ac9fd8232
Update .swiftlint.yml 
add lazy var rule to swiftlint
1e95815cce
Merge pull request #277 from TouchInstinct/feature/export_project_documentation 
GIT_BRANCH environment variable handling + add some docs
d2ce219af4
Merge pull request #289 from TouchInstinct/fix/add_custom_enviroment 
Add user defined enviroment for copy-paste decetion script
6bc60ac0ab
Merge pull request #290 from TouchInstinct/fix/php_not_found 
Add user enviroment for localization script
cd82b034ed
Merge pull request #304 from TouchInstinct/fix/codegen_fixes 
fix codegen project name parameter; manage codegen folders for convenience
454ec643b3
Merge pull request #307 from TouchInstinct/feature/config_generator_abstract_target_support 
add support for custom abstract targets in path to cocoapods xcconfigfiles.
fe8f581c48
Merge pull request #312 from TouchInstinct/feature/build_logs_in_project_folder 
add buildlog_path, speed up pod resolution, update build options helper submodule
44a7fd7f48
Merge pull request #316 from TouchInstinct/multiple_files 
Add multiple files generation optional flag
732df3171f
Merge pull request #319 from TouchInstinct/feature/api_gen_update 
update api_generator to support JDK 16+ and git-less run check
8e13458c7f
Merge pull request #320 from TouchInstinct/feature/xmx_update 
API Generator `-Xmx` parameter updated to 12Gb
1b8d06cb0d
Merge pull request #327 from TouchInstinct/feature/api_key_configuring 
API key configuration with environment variable added
18cf87ea18
Merge pull request #328 from TouchInstinct/fix/default_options 
`default_options` empty initializer added for correct method running
55ab60b6ea
Update export_src.sh 
<a href="https://github.com/TouchInstinct/BuildScripts/issues/276">issue-276</a> Перед экспортом репозитория проверить файлы на невалидные символы в именах
ce23c714e5
Merge pull request #332 from TouchInstinct/fix/makefile_identation 
Common `Makefile` indentations converted to tabs
082f618425 Merge branch 'master' into 'feature/issue-276' 
# Conflicts:
#   scripts/export_src.sh
98bb3953f1 Merge branch 'master' of https://git.svc.touchin.ru/TouchInstinct/BuildScripts into licard-dev 
 Conflicts:
	gradle/apiGenerator.gradle
	gradle/apiGeneratorKotlinServer.gradle
	gradle/commonStaticAnalysis.gradle
	xcode/build_phases/api_generator.sh
bogdan.terehov changed title from Поднятие версию Gradle до 7.5 to Подлитие мастера в Licard-dev 2023-04-20 22:56:32 +03:00
bogdan.terehov added 1 commit 2023-09-04 14:23:01 +03:00
bogdan.terehov force-pushed merge_master_in_licard_dev from 7709e330ef to e52ac6aca0 2023-09-04 14:47:59 +03:00 Compare
bogdan.terehov force-pushed merge_master_in_licard_dev from e52ac6aca0 to 2f7f77b3c0 2023-09-04 15:26:41 +03:00 Compare
bogdan.terehov closed this pull request 2023-09-04 18:42:35 +03:00
bogdan.terehov reopened this pull request 2023-09-04 18:42:40 +03:00
bogdan.terehov changed title from Подлитие мастера в Licard-dev to WIP: Подлитие мастера в Licard-dev 2023-09-04 18:43:11 +03:00
bogdan.terehov changed title from WIP: Подлитие мастера в Licard-dev to Подлитие мастера в Licard-dev 2023-09-04 18:43:24 +03:00
bogdan.terehov added 13 commits 2023-09-04 18:44:57 +03:00
bogdan.terehov force-pushed merge_master_in_licard_dev from 0d22d1a42f to 2daded5b93 2023-09-04 18:46:36 +03:00 Compare
bogdan.terehov added 2 commits 2023-09-04 18:50:41 +03:00
bogdan.terehov force-pushed merge_master_in_licard_dev from 771505b552 to 504f2c273d 2023-09-04 18:52:57 +03:00 Compare
bogdan.terehov added 1 commit 2023-09-04 19:03:30 +03:00
2271c418f2 Merge branch 'licard-dev' into merge_master_in_licard_dev 
# Conflicts:
#	gradle/apiGenerator.gradle
#	gradle/apiGeneratorKotlinServer.gradle
#	gradle/commonStaticAnalysis.gradle
#	xcode/build_phases/api_generator.sh
bogdan.terehov force-pushed merge_master_in_licard_dev from 2271c418f2 to 30bc5fb038 2023-09-04 19:05:04 +03:00 Compare
bogdan.terehov force-pushed merge_master_in_licard_dev from 30bc5fb038 to 504f2c273d 2023-09-04 19:08:59 +03:00 Compare
bogdan.terehov added 1 commit 2023-09-04 19:09:56 +03:00
05a99e4d50 Merge branch 'licard-dev' of https://git.svc.touchin.ru/TouchInstinct/BuildScripts into merge_master_in_licard_dev 
 Conflicts:
	gradle/apiGenerator.gradle
	gradle/apiGeneratorKotlinServer.gradle
	gradle/commonStaticAnalysis.gradle
	xcode/build_phases/api_generator.sh
bogdan.terehov force-pushed merge_master_in_licard_dev from 05a99e4d50 to 862201dc26 2023-09-04 19:12:36 +03:00 Compare
bogdan.terehov closed this pull request 2023-09-04 19:14:01 +03:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: TouchInstinct/BuildScripts#3
No description provided.
Delete Branch "merge_master_in_licard_dev"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?