diff --git a/.github/ISSUE_TEMPLATE/bug-issue.yml b/.github/ISSUE_TEMPLATE/bug-issue.yml index becd17bd6..193df90b4 100644 --- a/.github/ISSUE_TEMPLATE/bug-issue.yml +++ b/.github/ISSUE_TEMPLATE/bug-issue.yml @@ -36,7 +36,7 @@ body: - type: textarea attributes: label: Relevant log output - description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. + description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. Capture crash logs by running `logcat | grep AndroidRuntime`. render: shell validations: required: true @@ -70,4 +70,4 @@ body: - label: I have written a short but informative title. required: true - label: I filled out all of the requested information in this issue properly. - required: true \ No newline at end of file + required: true diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0b3237494..605e7a721 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,10 +7,11 @@ on: workflow_dispatch: env: - MESSAGE: merge branch \`${{ github.head_ref || github.ref_name }}\` to \`main\` + MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main` jobs: pull-request: + name: Open pull request runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8955bf2b7..8755adc21 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,5 @@ name: Release + on: workflow_dispatch: push: @@ -9,6 +10,7 @@ on: branches: - main - dev + jobs: release: name: Release @@ -17,6 +19,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 with: + # Make sure the release step uses its own credentials: + # https://github.com/cycjimmy/semantic-release-action#private-packages + persist-credentials: false fetch-depth: 0 - name: Setup JDK uses: actions/setup-java@v3 @@ -40,8 +45,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew generateMeta clean --no-daemon - name: Setup semantic-release - run: npm install semantic-release @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D + run: npm install semantic-release@19.0.5 @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin@1.7.4 -D - name: Release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }} run: npx semantic-release diff --git a/build.gradle.kts b/build.gradle.kts index ad2fbd042..ae1de6cb2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,10 +20,10 @@ repositories { } dependencies { - implementation("app.revanced:revanced-patcher:6.4.0") - implementation("app.revanced:multidexlib2:2.5.2.r2") + implementation("app.revanced:revanced-patcher:6.4.2") + implementation("app.revanced:multidexlib2:2.5.3-a3836654") // Required for meta - implementation("com.google.code.gson:gson:2.10") + implementation("com.google.code.gson:gson:2.10.1") } tasks { @@ -53,7 +53,7 @@ tasks { dependsOn(build) classpath = sourceSets["main"].runtimeClasspath - mainClass.set("app.revanced.meta.Meta") + mainClass.set("app.revanced.meta.PatchesFileGenerator") } // Dummy task to fix the Gradle semantic-release plugin. // Remove this if you forked it to support building only.