From c0e6efc400a4666dee7c2299556c8a9bcf1f7276 Mon Sep 17 00:00:00 2001 From: "ADMSK\\AVROGAL1" Date: Fri, 22 Jan 2021 18:22:42 +0300 Subject: [PATCH] Chngeset: updates on scripts + workflows --- SUMMARY.md | 1 + docs/index.md | 3 ++- docs/user-guide/how-to-move-content.md | 34 ++++++++++++++++++++++++++ mkdocs.yml | 1 + pom.xml | 27 +++++++++++++++++--- 5 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 docs/user-guide/how-to-move-content.md diff --git a/SUMMARY.md b/SUMMARY.md index fe4e1dff..5ebb371b 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -38,6 +38,7 @@ * [Code Owners](docs/user-guide/code_owners.md) * [Code of Conduct](docs/user-guide/code_of_conduct.md) * [Dependency Management](docs/user-guide/dependency.md) + * [Cloning content](docs/user-guide/how-to-move-content.md) * [links] * [Resources](docs/links/info.md) diff --git a/docs/index.md b/docs/index.md index f646413c..d1469cc7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -65,7 +65,8 @@ docs/ faq.md # FAQ page getting-started.md # Getting started page troubleshooting.md # Troubleshooting page - upgrade.md # Upgrade page + how-to-move-content.md # Cloning project content page + upgrade.md # Upgrade project page reporting/ info.md # Informational page issue_template.md # Issue template page diff --git a/docs/user-guide/how-to-move-content.md b/docs/user-guide/how-to-move-content.md new file mode 100644 index 00000000..72c0a162 --- /dev/null +++ b/docs/user-guide/how-to-move-content.md @@ -0,0 +1,34 @@ +# Repositories: How to move content from one repository to another one + +## Goal + +The content from the source repository should keep the Git history. + +## Steps + +1. Create a new repository with the content to move: +``` +git clone git@github.com:AlexRogalskiy/.git +cd +git-filter-repo --path \ + --path \ + --path \ + ... +``` +2. Publish that new repository +3. Add it as a remote repository to the target repository: +``` +git clone git@github.com:AlexRogalskiy/.git +cd +git remote add new-content +git fetch new-content +``` +4. Merge the extracted content: +``` +cd +git merge --allow-unrelated-histories new-content/master +# (adapt the content if it's necessary) +git push origin master +``` +5. Remove the published repository (step 2) +6. Create a pull request into the source repository to remove the extracted content diff --git a/mkdocs.yml b/mkdocs.yml index fbf9734b..3c17e585 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -60,6 +60,7 @@ pages: - Code Owners: user-guide/code_owners.md - Troubleshooting: user-guide/troubleshooting.md - Upgrade: user-guide/upgrade.md + - Cloning content: user-guide/how-to-move-content.md - Modules: - BeanCp Tutorial: modules/beancp/info.md - BeanMapper Tutorial: modules/beanmapper/info.md diff --git a/pom.xml b/pom.xml index 05b230a8..73e22459 100644 --- a/pom.xml +++ b/pom.xml @@ -1329,17 +1329,26 @@ true + 0.11.0 1.4.10 1.3.9 + + io.arrow-kt + arrow-stack + ${arrow.version} + pom + import + org.jetbrains.kotlin kotlin-bom ${kotlin.version} pom + import @@ -1354,7 +1363,6 @@ - org.jetbrains.kotlin @@ -1376,6 +1384,21 @@ + + kapt + + kapt + + + + + io.arrow-kt + arrow-meta + ${arrow.version} + + + + compile process-sources @@ -1425,7 +1448,6 @@ - org.jetbrains.kotlin @@ -1457,7 +1479,6 @@ kotlinx-coroutines-reactor ${kotlinx-coroutines.version} - org.jetbrains.kotlinx