Chngeset: updates on scripts + workflows

AlexRogalskiy · Jan 22, 2021 · c0e6efc · c0e6efc
1 parent bfe84af
commit c0e6efc
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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/<source-repository>.git
+cd <source-repository>
+git-filter-repo --path <path-to-extract> \
+ --path <path-to-extract> \
+ --path <path-to-extract> \
+ ...
+```
+2. Publish that new repository
+3. Add it as a remote repository to the target repository:
+```
+git clone git@github.com:AlexRogalskiy/<target-repository>.git
+cd <target-repository>
+git remote add new-content <url>
+git fetch new-content
+```
+4. Merge the extracted content:
+```
+cd <target-repository>
+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
@@ -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
@@ -1329,17 +1329,26 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
+                <arrow.version>0.11.0</arrow.version>
                 <kotlin.version>1.4.10</kotlin.version>
                 <kotlinx-coroutines.version>1.3.9</kotlinx-coroutines.version>
             </properties>
 
             <dependencyManagement>
                 <dependencies>
+                    <dependency>
+                        <groupId>io.arrow-kt</groupId>
+                        <artifactId>arrow-stack</artifactId>
+                        <version>${arrow.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
                     <dependency>
                         <groupId>org.jetbrains.kotlin</groupId>
                         <artifactId>kotlin-bom</artifactId>
                         <version>${kotlin.version}</version>
                         <type>pom</type>
+                        <scope>import</scope>
                     </dependency>
                 </dependencies>
             </dependencyManagement>
@@ -1354,7 +1363,6 @@
                         </plugin>
                     </plugins>
                 </pluginManagement>
-
                 <plugins>
                     <plugin>
                         <groupId>org.jetbrains.kotlin</groupId>
@@ -1376,6 +1384,21 @@
                             </sourceDirs>
                         </configuration>
                         <executions>
+                            <execution>
+                                <id>kapt</id>
+                                <goals>
+                                    <goal>kapt</goal>
+                                </goals>
+                                <configuration>
+                                    <annotationProcessorPaths>
+                                        <annotationProcessorPath>
+                                            <groupId>io.arrow-kt</groupId>
+                                            <artifactId>arrow-meta</artifactId>
+                                            <version>${arrow.version}</version>
+                                        </annotationProcessorPath>
+                                    </annotationProcessorPaths>
+                                </configuration>
+                            </execution>
                             <execution>
                                 <id>compile</id>
                                 <phase>process-sources</phase>
@@ -1425,7 +1448,6 @@
                     </plugin>
                 </plugins>
             </build>
-
             <dependencies>
                 <dependency>
                     <groupId>org.jetbrains.kotlin</groupId>
@@ -1457,7 +1479,6 @@
                     <artifactId>kotlinx-coroutines-reactor</artifactId>
                     <version>${kotlinx-coroutines.version}</version>
                 </dependency>
-
                 <!-- Kotlinx serialization library dependencies -->
                 <dependency>
                     <groupId>org.jetbrains.kotlinx</groupId>