From 703965a0ddf5af65769c071fd1ff21a18a664b4e Mon Sep 17 00:00:00 2001 From: Surim Kim Date: Mon, 8 Apr 2024 09:38:54 +0900 Subject: [PATCH] Remove -XX:MaxPermSize option. Android Gradle requires JDK 17, and this option was removed between Java 11 and Java 17. --- .github/workflows/build.yml | 9 ++++----- V2rayNG/gradle.properties | 2 +- V2rayNG/gradlew | 0 3 files changed, 5 insertions(+), 6 deletions(-) mode change 100644 => 100755 V2rayNG/gradlew diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75ccf940..8d8ce311 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,11 +12,11 @@ on: jobs: build: runs-on: ubuntu-latest - + steps: - name: Checkout code uses: actions/checkout@v4 - + - name: Setup Java uses: actions/setup-java@v4 with: @@ -36,7 +36,7 @@ jobs: - name: Setup Android environment uses: android-actions/setup-android@v3 - + - name: Build dependencies run: | @@ -53,8 +53,7 @@ jobs: - name: Build APK run: | cd ${{ github.workspace }}/V2rayNG - chmod 777 * - sed -i 's/org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8/org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8/' ${{ github.workspace }}/V2rayNG/gradle.properties + chmod 755 gradlew ./gradlew assembleDebug - name: Upload APK diff --git a/V2rayNG/gradle.properties b/V2rayNG/gradle.properties index 05a3094d..9e2f93c2 100644 --- a/V2rayNG/gradle.properties +++ b/V2rayNG/gradle.properties @@ -3,4 +3,4 @@ android.useAndroidX=true android.enableJetifier=true kotlin.code.style=official android.nonTransitiveRClass=true -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 diff --git a/V2rayNG/gradlew b/V2rayNG/gradlew old mode 100644 new mode 100755