From 0354b33017774b93c00f2aeb0b086f28958c461d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Segovia=20C=C3=B3rdoba?= Date: Sun, 3 Oct 2021 17:31:01 +0200 Subject: [PATCH] Improve Gradle config - Bump `arrow-gradle-config` plugins to 0.3.2 - Set `group` and `version` in `arrow-libs` - Disable Dokka in some projects - Improve publish workflow --- .github/scripts/set-env.sh | 4 ++-- .github/workflows/publish.yml | 10 +++++----- arrow-libs/ank/build.gradle | 5 ----- arrow-libs/build.gradle.kts | 5 +++++ arrow-libs/core/arrow-core-test/build.gradle.kts | 4 ++++ arrow-libs/core/arrow-meta/build.gradle.kts | 4 ++++ .../fx/arrow-fx-coroutines-test/build.gradle.kts | 4 ++++ arrow-libs/optics/arrow-optics-test/build.gradle.kts | 4 ++++ arrow-site/gradle.properties | 2 +- gradle/libs.versions.toml | 2 +- 10 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.github/scripts/set-env.sh b/.github/scripts/set-env.sh index 16ae5ec08d4..c5945b4050e 100755 --- a/.github/scripts/set-env.sh +++ b/.github/scripts/set-env.sh @@ -15,12 +15,12 @@ if [ "$GITHUB_REF" == "refs/heads/main" ]; then fi if [ "$LATEST_PUBLISHED_VERSION" == "" ]; then exit 1; fi - RELEASE_VERSION=$(grep projects.latestVersion $BASEDIR/gradle.properties | cut -d= -f2) + RELEASE_VERSION=$(grep "projects.latestVersion" $BASEDIR/gradle.properties | cut -d= -f2) if [ "$LATEST_PUBLISHED_VERSION" != "$RELEASE_VERSION" ]; then NEW_RELEASE_VERSION_EXISTS=1; fi else echo "Into release branch ..." BRANCH_VERSION=$(echo $GITHUB_REF | cut -d/ -f4) - RELEASE_VERSION=$(grep projects.latestVersion $BASEDIR/gradle.properties | cut -d= -f2) + RELEASE_VERSION=$(grep "projects.latestVersion" $BASEDIR/gradle.properties | cut -d= -f2) if [ "$BRANCH_VERSION" == "$RELEASE_VERSION" ]; then NEW_RELEASE_VERSION_EXISTS=1 else diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index dd082f528c3..8c57730c571 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,7 +30,7 @@ env: jobs: publish_apple_linux_jvm_js: runs-on: macos-latest - timeout-minutes: 120 + timeout-minutes: 35 steps: - uses: actions/checkout@v2 @@ -61,7 +61,7 @@ jobs: - name: Publish Apple, Linux, JVM & JS targets working-directory: arrow-libs run: | - ./gradlew publishToSonatype --stacktrace --debug + ./gradlew publishToSonatype echo "$(cat $BASEDIR/gradle.properties | grep projects.version | cut -d'=' -f2) Apple, Linux, JVM & JS deployed!" - name: Stop Gradle daemons @@ -69,7 +69,7 @@ jobs: publish_windows: runs-on: windows-latest - timeout-minutes: 20 + timeout-minutes: 25 steps: - uses: actions/checkout@v2 @@ -99,7 +99,7 @@ jobs: - name: Publish Windows working-directory: arrow-libs run: | - ./gradlew publishToSonatype --stacktrace --debug + ./gradlew publishToSonatype echo "$(cat gradle.properties | grep projects.version | cut -d'=' -f2) MingwX64 deployed!" - name: Stop Gradle daemons @@ -137,7 +137,7 @@ jobs: publish_doc: env: JAVA_OPTS: -Xms2g -Xmx4g - GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Dorg.gradle.parallel=false" + GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.configureondemand=true -Dorg.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+CMSClassUnloadingEnabled -Dfile.encoding=UTF-8 -Dorg.gradle.parallel=false" AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} S3_BUCKET: ${{ secrets.S3_BUCKET }} diff --git a/arrow-libs/ank/build.gradle b/arrow-libs/ank/build.gradle index e72bd62ceec..fa41235c8e7 100644 --- a/arrow-libs/ank/build.gradle +++ b/arrow-libs/ank/build.gradle @@ -20,8 +20,3 @@ plugins { configure("arrow-ank") { apply from: "$ROOT_PROJECT" } - -allprojects { - group = property("projects.group").toString() - version = property("projects.version").toString() -} diff --git a/arrow-libs/build.gradle.kts b/arrow-libs/build.gradle.kts index 524ccc2c897..723b2dc6530 100644 --- a/arrow-libs/build.gradle.kts +++ b/arrow-libs/build.gradle.kts @@ -12,6 +12,11 @@ plugins { alias(libs.plugins.arrowGradleConfig.nexus) } +allprojects { + group = property("projects.group").toString() + version = property("projects.version").toString() +} + tasks { val generateDoc by creating(Exec::class) { group = "documentation" diff --git a/arrow-libs/core/arrow-core-test/build.gradle.kts b/arrow-libs/core/arrow-core-test/build.gradle.kts index 2c14c3c304e..a775795910d 100644 --- a/arrow-libs/core/arrow-core-test/build.gradle.kts +++ b/arrow-libs/core/arrow-core-test/build.gradle.kts @@ -5,6 +5,10 @@ plugins { apply(from = property("ANIMALSNIFFER_MPP")) +publishMultiplatform { + isDokkaEnabled = false +} + kotlin { sourceSets { commonMain { diff --git a/arrow-libs/core/arrow-meta/build.gradle.kts b/arrow-libs/core/arrow-meta/build.gradle.kts index 3451d7a3916..9408c323ca4 100644 --- a/arrow-libs/core/arrow-meta/build.gradle.kts +++ b/arrow-libs/core/arrow-meta/build.gradle.kts @@ -4,6 +4,10 @@ plugins { id("org.jetbrains.kotlin.kapt") } +publishJVM { + isDokkaEnabled = false +} + dependencies { api(projects.arrowAnnotations) api(libs.arrow.kotlinMetadata) diff --git a/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle.kts b/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle.kts index af9ec8b20db..b5e9c3253f4 100644 --- a/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle.kts +++ b/arrow-libs/fx/arrow-fx-coroutines-test/build.gradle.kts @@ -3,6 +3,10 @@ plugins { alias(libs.plugins.arrowGradleConfig.publishMultiplatform) } +publishMultiplatform { + isDokkaEnabled = false +} + apply(from = property("DOC_CREATION")) apply(from = property("ANIMALSNIFFER_MPP")) diff --git a/arrow-libs/optics/arrow-optics-test/build.gradle.kts b/arrow-libs/optics/arrow-optics-test/build.gradle.kts index db8258b1b10..5b8e1bcfafd 100644 --- a/arrow-libs/optics/arrow-optics-test/build.gradle.kts +++ b/arrow-libs/optics/arrow-optics-test/build.gradle.kts @@ -3,6 +3,10 @@ plugins { alias(libs.plugins.arrowGradleConfig.publishMultiplatform) } +publishMultiplatform { + isDokkaEnabled = false +} + apply(from = property("ANIMALSNIFFER_MPP")) kotlin { diff --git a/arrow-site/gradle.properties b/arrow-site/gradle.properties index 9c848449910..be254d5e1a6 100644 --- a/arrow-site/gradle.properties +++ b/arrow-site/gradle.properties @@ -3,7 +3,7 @@ POM_NAME=Docs POM_ARTIFACT_ID=docs POM_PACKAGING=jar # Gradle options -org.gradle.jvmargs=-Xmx4g +org.gradle.jvmargs=-Xmx8g org.gradle.parallel=true # Kotlin configuration kotlin.incremental=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6dcefd8261d..867f30d9d29 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] animalSniffer = "1.5.0" -arrowGradleConfig = "0.2.1" +arrowGradleConfig = "0.3.2" autoService = "1.0-rc7" compileTesting = "0.18" coroutines = "1.5.2"