From d9430e4eae8ec4bfe1c0ccc2ef61c6a260a136b8 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 (cherry picked from commit 1e64542f143366cb53e979da7dbe65fa04e1de36) # Conflicts: # .github/workflows/build_pull_request.yml # .github/workflows/build_push.yml --- .github/runner-files/ci-gradle.properties | 5 ----- .github/workflows/TachiyomiSY-Release-Builder.yml | 5 ----- .github/workflows/build_check.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 3b340e957..000000000 --- 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/TachiyomiSY-Release-Builder.yml b/.github/workflows/TachiyomiSY-Release-Builder.yml index cd02bf6e2..eb7a29d17 100644 --- a/.github/workflows/TachiyomiSY-Release-Builder.yml +++ b/.github/workflows/TachiyomiSY-Release-Builder.yml @@ -37,11 +37,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: Write google-services.json uses: DamianReeves/write-file-action@v1.0 with: diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 90e9eebb7..3968a1aa9 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -33,11 +33,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 uses: gradle/gradle-command-action@v2 with: diff --git a/gradle.properties b/gradle.properties index 01e93dde6..e9eff53d0 100755 --- 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