From 1e64542f143366cb53e979da7dbe65fa04e1de36 Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 11 Jun 2022 11:38:16 -0400 Subject: [PATCH] [skip ci] Remove CI-specific Gradle config Newer versions of gradle-build-action allows the daemon to persist across build steps --- .github/runner-files/ci-gradle.properties | 5 ----- .github/workflows/build_pull_request.yml | 5 ----- .github/workflows/build_push.yml | 5 ----- gradle.properties | 2 +- 4 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 .github/runner-files/ci-gradle.properties diff --git a/.github/runner-files/ci-gradle.properties b/.github/runner-files/ci-gradle.properties deleted file mode 100644 index 3b340e9573..0000000000 --- a/.github/runner-files/ci-gradle.properties +++ /dev/null @@ -1,5 +0,0 @@ -org.gradle.daemon=false -org.gradle.jvmargs=-Xmx5120m -org.gradle.workers.max=2 - -kotlin.incremental=false \ No newline at end of file diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml index f25d210d11..259496cf95 100644 --- a/.github/workflows/build_pull_request.yml +++ b/.github/workflows/build_pull_request.yml @@ -29,11 +29,6 @@ jobs: java-version: 11 distribution: adopt - - name: Copy CI gradle.properties - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties - - name: Build app and run unit tests uses: gradle/gradle-command-action@v2 with: diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 2bf98b0417..303c4d2da1 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -30,11 +30,6 @@ jobs: java-version: 11 distribution: adopt - - name: Copy CI gradle.properties - run: | - mkdir -p ~/.gradle - cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties - - name: Build app and run unit tests uses: gradle/gradle-command-action@v2 with: diff --git a/gradle.properties b/gradle.properties index ff77efb1c0..dda7175753 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -org.gradle.jvmargs=-Xmx4096m +org.gradle.jvmargs=-Xmx5120m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit