.editorconfig

@@ -3,4 +3,4 @@
 indent_size=2
 insert_final_newline=true
 max_line_length=off
-disabled_rules=import-ordering,no-unit-return
+disabled_rules=import-ordering,no-unit-return,curly-spacing

.github/workflows/build_arrow-core.yml

@@ -18,9 +18,13 @@ jobs:
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
     - name: Checkout orchestrator
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        cd $BASEDIR
-        git clone https://github.com/arrow-kt/arrow.git --depth 1 --no-single-branch
+        BRANCH_NAME=${{ github.event.pull_request.head.ref }}
+        git clone https://github.com/arrow-kt/arrow.git $BASEDIR/arrow --depth 1 --no-single-branch
+        . $BASEDIR/arrow/scripts/commons4gradle.sh
+        updateOrchestrator $BRANCH_NAME
     - name: Install
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build_doc_arrow-core.yml

@@ -16,9 +16,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Checkout orchestrator
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        cd $BASEDIR
-        git clone https://github.com/arrow-kt/arrow.git --depth 1 --no-single-branch
+        BRANCH_NAME=${{ github.event.pull_request.head.ref }}
+        git clone https://github.com/arrow-kt/arrow.git $BASEDIR/arrow --depth 1 --no-single-branch
+        . $BASEDIR/arrow/scripts/commons4gradle.sh
+        updateOrchestrator $BRANCH_NAME
     - name: Install
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check_previous_build_integration.yml

@@ -15,9 +15,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Checkout orchestrator
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        cd $BASEDIR
-        git clone https://github.com/arrow-kt/arrow.git --depth 1 --no-single-branch
+        BRANCH_NAME=${{ github.event.pull_request.head.ref }}
+        git clone https://github.com/arrow-kt/arrow.git $BASEDIR/arrow --depth 1 --no-single-branch
+        . $BASEDIR/arrow/scripts/commons4gradle.sh
+        updateOrchestrator $BRANCH_NAME
     - name: Check Build Integration
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check_previous_doc_integration.yml

@@ -15,9 +15,13 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Checkout orchestrator
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        cd $BASEDIR
-        git clone https://github.com/arrow-kt/arrow.git --depth 1 --no-single-branch
+        BRANCH_NAME=${{ github.event.pull_request.head.ref }}
+        git clone https://github.com/arrow-kt/arrow.git $BASEDIR/arrow --depth 1 --no-single-branch
+        . $BASEDIR/arrow/scripts/commons4gradle.sh
+        updateOrchestrator $BRANCH_NAME
     - name: Check Doc Integration
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

arrow-annotations/build.gradle

@@ -1,15 +1,10 @@
 plugins {
-    id "maven-publish"
-    id "base"
     id "org.jetbrains.kotlin.jvm"
-    id "org.jetbrains.dokka"
     id "org.jlleitschuh.gradle.ktlint"
-    id "ru.vyarus.animalsniffer"
 }
 
-apply from: "$SUBPROJECT_CONF"
-apply from: "$DOC_CONF"
-apply from: "$PUBLISH_CONF"
+apply from: "$SUB_PROJECT"
+apply from: "$DOC_CREATION"
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"

arrow-core-data/build.gradle

@@ -1,18 +1,14 @@
 plugins {
-    id "maven-publish"
-    id "base"
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.kapt"
-    id "org.jetbrains.dokka"
     id "org.jlleitschuh.gradle.ktlint"
-    id "ru.vyarus.animalsniffer"
 }
 
-apply from: "$SUBPROJECT_CONF"
-apply from: "$DOC_CONF"
-apply from: "$PUBLISH_CONF"
 apply plugin: 'kotlinx-atomicfu'
 
+apply from: "$SUB_PROJECT"
+apply from: "$DOC_CREATION"
+
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
     compile project(":arrow-annotations")

arrow-core-retrofit/build.gradle

@@ -1,15 +1,10 @@
 plugins {
-    id "maven-publish"
-    id "base"
     id "org.jetbrains.kotlin.jvm"
-    id "org.jetbrains.dokka"
     id "org.jlleitschuh.gradle.ktlint"
-    id "ru.vyarus.animalsniffer"
 }
 
-apply from: "$SUBPROJECT_CONF"
-apply from: "$DOC_CONF"
-apply from: "$PUBLISH_CONF"
+apply from: "$SUB_PROJECT"
+apply from: "$DOC_CREATION"
 
 dependencies {
     compile project(":arrow-core-data")

arrow-core-test/build.gradle

@@ -1,13 +1,9 @@
 plugins {
-    id "maven-publish"
-    id "base"
     id "org.jetbrains.kotlin.jvm"
     id "org.jlleitschuh.gradle.ktlint"
-    id "ru.vyarus.animalsniffer"
 }
 
-apply from: "$SUBPROJECT_CONF"
-apply from: "$PUBLISH_CONF"
+apply from: "$SUB_PROJECT"
 
 dependencies {
     compile project(":arrow-core")

arrow-core/build.gradle

@@ -1,16 +1,11 @@
 plugins {
-    id "maven-publish"
-    id "base"
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.kapt"
-    id "org.jetbrains.dokka"
     id "org.jlleitschuh.gradle.ktlint"
-    id "ru.vyarus.animalsniffer"
 }
 
-apply from: "$SUBPROJECT_CONF"
-apply from: "$DOC_CONF"
-apply from: "$PUBLISH_CONF"
+apply from: "$SUB_PROJECT"
+apply from: "$DOC_CREATION"
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"

arrow-docs/build.gradle

@@ -8,14 +8,13 @@ buildscript {
 }
 
 plugins {
-    id "base"
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.kapt"
     id "org.jlleitschuh.gradle.ktlint"
-    id "ru.vyarus.animalsniffer"
 }
 
-apply from: "$SUBPROJECT_CONF"
+apply from: "$SUB_PROJECT"
+apply from: "$DOC_VALIDATION"
 
 dependencies {
     compile project(":arrow-core-data")
@@ -28,11 +27,3 @@ dependencies {
     compile project(":arrow-meta")
     kapt project(":arrow-meta")
 }
-
-apply plugin: 'ank-gradle-plugin'
-
-ank {
-    source = file("${projectDir}/docs")
-    target = file("${projectDir}/build/site")
-    classpath = sourceSets.main.runtimeClasspath
-}

arrow-meta/arrow-meta-test-models/build.gradle

@@ -1,12 +1,10 @@
 plugins {
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.kapt"
-    id "org.jetbrains.dokka"
     id "org.jlleitschuh.gradle.ktlint"
-    id "ru.vyarus.animalsniffer"
 }
 
-apply from: "$DOC_CONF"
+apply from: "$DOC_CREATION"
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"

arrow-meta/build.gradle

@@ -1,17 +1,13 @@
 import org.gradle.internal.jvm.Jvm
 
 plugins {
-    id "maven-publish"
-    id "base"
     id "org.jetbrains.kotlin.jvm"
     id "org.jetbrains.kotlin.kapt"
-    id "org.jetbrains.dokka"
     id "org.jlleitschuh.gradle.ktlint"
 }
 
-apply from: "$SUBPROJECT_CONF"
-apply from: "$DOC_CONF"
-apply from: "$PUBLISH_CONF"
+apply from: "$SUB_PROJECT"
+apply from: "$DOC_CREATION"
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"

arrow-syntax/build.gradle

@@ -1,15 +1,10 @@
 plugins {
-    id "maven-publish"
-    id "base"
     id "org.jetbrains.kotlin.jvm"
-    id "org.jetbrains.dokka"
     id "org.jlleitschuh.gradle.ktlint"
-    id "ru.vyarus.animalsniffer"
 }
 
-apply from: "$SUBPROJECT_CONF"
-apply from: "$DOC_CONF"
-apply from: "$PUBLISH_CONF"
+apply from: "$SUB_PROJECT"
+apply from: "$DOC_CREATION"
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"

build.gradle

@@ -2,28 +2,32 @@ buildscript {
     apply from: "$COMMON_SETUP"
     repositories {
         jcenter()
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
+        mavenCentral()
     }
     dependencies {
         classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$ATOMICFU_VERSION"
     }
 }
 
 plugins {
-    id "maven-publish"
-    id "base"
     id "org.jetbrains.kotlin.jvm" version "$KOTLIN_VERSION"
-    id "org.jetbrains.kotlin.kapt" version "$KOTLIN_VERSION"
-    id "org.jetbrains.dokka" version "$DOKKA_VERSION" apply false
+    id "org.jetbrains.kotlin.kapt" version "$KOTLIN_VERSION" apply false
     id "org.jlleitschuh.gradle.ktlint" version "$KTLINT_GRADLE_VERSION"
-    id "ru.vyarus.animalsniffer" version "$ANIMALS_SNIFFER_VERSION"
+    id "org.jetbrains.dokka" version "$DOKKA_VERSION" apply false
+    id "ru.vyarus.animalsniffer" version "$ANIMALS_SNIFFER_VERSION" apply false
 }
 
-apply from: "$GENERIC_CONF"
+apply from: "$ROOT_PROJECT"
+
+// -- Artifacts publication
+subprojects {
+    apply from: "$PUBLICATION"
+}
 
-configure(subprojects - project("arrow-meta")) {
+// -- Gradle Animal Sniffer Plugin: https://github.com/xvik/gradle-animalsniffer-plugin
+configure(subprojects
+            - project("arrow-meta")
+) {
     apply plugin: 'ru.vyarus.animalsniffer'
     apply plugin: 'java'
     dependencies {

gradle.properties

@@ -1,9 +1,10 @@
 # Build properties
-COMMON_SETUP=https://raw.githubusercontent.com/arrow-kt/arrow/master/setup.gradle
-GENERIC_CONF=https://raw.githubusercontent.com/arrow-kt/arrow/master/generic-conf.gradle
-SUBPROJECT_CONF=https://raw.githubusercontent.com/arrow-kt/arrow/master/subproject-conf.gradle
-DOC_CONF=https://raw.githubusercontent.com/arrow-kt/arrow/master/doc-conf.gradle
-PUBLISH_CONF=https://raw.githubusercontent.com/arrow-kt/arrow/master/publish-conf.gradle
+COMMON_SETUP=https://raw.githubusercontent.com/arrow-kt/arrow/master/gradle/setup.gradle
+ROOT_PROJECT=https://raw.githubusercontent.com/arrow-kt/arrow/master/gradle/main.gradle
+SUB_PROJECT=https://raw.githubusercontent.com/arrow-kt/arrow/master/gradle/subproject.gradle
+DOC_CREATION=https://raw.githubusercontent.com/arrow-kt/arrow/master/gradle/apidoc-creation.gradle
+DOC_VALIDATION=https://raw.githubusercontent.com/arrow-kt/arrow/master/gradle/doc-validation.gradle
+PUBLICATION=https://raw.githubusercontent.com/arrow-kt/arrow/master/gradle/publication.gradle
 # Gradle options
 org.gradle.jvmargs=-Xmx4g
 org.gradle.parallel=true

scripts/checkout-orchestrator.sh

@@ -5,9 +5,5 @@ cd ${ROOTDIR}/..
 BASEDIR=$(pwd)
 if [ ! -d arrow ]; then
     echo "Clone arrow repository in $BASEDIR/arrow ..."
-    git clone https://github.com/arrow-kt/arrow.git
-else
-    echo "Updating $INSTALLDIR/arrow ..."
-    cd arrow
-    git pull
+    git clone git@github.com:arrow-kt/arrow.git
 fi