Compare commits

...

13 Commits

Author SHA1 Message Date
semantic-release-bot
10f35eb727 chore(release): 1.24.1-dev.4 [skip ci]
## [1.24.1-dev.4](https://github.com/ReVanced/revanced-manager/compare/v1.24.1-dev.3...v1.24.1-dev.4) (2025-04-13)

### Bug Fixes

* Log errors and warnings when compiling resources ([5c7d52c](5c7d52c8e9))
2025-04-13 15:48:47 +00:00
oSumAtrIX
5c7d52c8e9
fix: Log errors and warnings when compiling resources 2025-04-13 17:38:20 +02:00
Pun Butrach
841d61278b
chore: Ignore Dart analysis on generated slang file 2025-04-12 01:27:28 +07:00
Pun Butrach
534e4c2453
ci: Point to Android directory 2025-04-10 23:59:39 +07:00
oSumAtrIX
062f28387f
ci: Modernize workflows (#2473)
Co-authored-by: Pun Butrach <pun.butrach@gmail.com>
2025-04-10 23:47:26 +07:00
semantic-release-bot
a8a4ffabed chore(release): 1.24.1-dev.3 [skip ci]
## [1.24.1-dev.3](https://github.com/ReVanced/revanced-manager/compare/v1.24.1-dev.2...v1.24.1-dev.3) (2025-04-10)

### Bug Fixes

* Correct supported required patch option types  ([#2475](https://github.com/ReVanced/revanced-manager/issues/2475)) ([cde3f8d](cde3f8d62c))
2025-04-10 15:26:56 +00:00
Pun Butrach
cde3f8d62c
fix: Correct supported required patch option types (#2475)
Signed-off-by: Pun Butrach <pun.butrach@gmail.com>
2025-04-10 22:15:29 +07:00
Pun Butrach
8182228a46
chore: Default project Flutter devtools options configuration for debugging 2025-04-10 22:08:04 +07:00
Pun Butrach
7fa5daf623
chore: Remove Android cxx generated file
Signed-off-by: Pun Butrach <pun.butrach@gmail.com>
2025-04-10 22:05:38 +07:00
semantic-release-bot
221e663e47 chore(release): 1.24.1-dev.2 [skip ci]
## [1.24.1-dev.2](https://github.com/ReVanced/revanced-manager/compare/v1.24.1-dev.1...v1.24.1-dev.2) (2025-04-09)

### Bug Fixes

* Unable to Share Logs due to missing ProGuard rules ([#2474](https://github.com/ReVanced/revanced-manager/issues/2474)) ([915ec0e](915ec0e260))
2025-04-09 20:20:00 +00:00
Pun Butrach
915ec0e260
fix: Unable to Share Logs due to missing ProGuard rules (#2474)
Technical commit message: fix: Unable to Share Logs due to CCE in FileProvider

Signed-off-by: Pun Butrach <pun.butrach@gmail.com>
2025-04-10 03:09:15 +07:00
semantic-release-bot
783f313ed8 chore(release): 1.24.1-dev.1 [skip ci]
## [1.24.1-dev.1](https://github.com/ReVanced/revanced-manager/compare/v1.24.0...v1.24.1-dev.1) (2025-04-04)

### Bug Fixes

* Crash using when Integer type in Patch Options ([#2453](https://github.com/ReVanced/revanced-manager/issues/2453)) ([05575cc](05575cccfb))
2025-04-04 16:11:35 +00:00
Pun Butrach
05575cccfb
fix: Crash using when Integer type in Patch Options (#2453) 2025-04-04 22:59:06 +07:00
11 changed files with 56 additions and 110 deletions

View File

@ -3,42 +3,18 @@ name: Build pull request
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
# Select pull request
pr-number: pr-number:
description: PR number (Without hashtag) description: PR number
required: true required: true
# Select app flavor
app-flavor: app-flavor:
description: App flavor description: App flavor
default: 'release' default: release
type: choice type: choice
options: options:
- release - release
- debug - debug
- profile - profile
# Flutter Configurations,
# it's recommended to be set when you have problem regarding with flutter itself
# For most part you do not need to change this.
# Flutter version to use, note that the version had to exist in whether channel
# to grab
# Try using exact version or particular version on a specific branch instead of "any"
flutter-channel:
description: Flutter channel
default: 'stable'
type: choice
options:
- stable
- beta
- dev
- any
flutter-version:
description: Flutter version
default: '3.29.x'
run-name: "Build pull request ${{ inputs.pr-number }}"
jobs: jobs:
build: build:
name: Build name: Build
@ -62,76 +38,27 @@ jobs:
- name: Set up Flutter - name: Set up Flutter
uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
with: with:
channel: ${{ inputs.flutter-channel }} channel: stable
flutter-version: ${{ inputs.flutter-version }}
- name: Get dependencies - name: Get dependencies
continue-on-error: true
run: flutter pub get run: flutter pub get
- name: Generate translations - name: Generate translations
continue-on-error: true
run: dart run slang run: dart run slang
- name: Generate code files - name: Generate code files
continue-on-error: true
run: dart run build_runner build --delete-conflicting-outputs run: dart run build_runner build --delete-conflicting-outputs
- name: Build - name: Build
continue-on-error: true
id: flutter-build id: flutter-build
run: flutter build apk --${{ inputs.app-flavor }} run: flutter build apk --${{ inputs.app-flavor }}
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Prepare comment - name: Upload artifacts
id: prepare-comment # This should work now?
run: |
echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
if [[ "${{ steps.flutter-build.outcome }}" == "success" ]]; then
MESSAGE="✅ Succeeded build on $COMMIT_HASH."
else
MESSAGE="🚫 Failed build on $COMMIT_HASH."
fi
- name: "Comment on pull request #${{ inputs.pr-number }}"
uses: thollander/actions-comment-pull-request@v3
with:
github-token: ${{ github.token }}
pr-number: ${{ inputs.pr-number }}
mode: recreate
comment-tag: execution
message: |
## ⚒️ Build status
🧪 Workflow triggered by: ${{ github.actor }}
${{ steps.prepare-comment.outputs.MESSAGE }}
Details: [_Job execution **${{ github.run_id }}** / attempt **${{ github.run_attempt }}**_](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})!
### ⚙️ Workflow Steps
| Step | Status |
| :------------------------ | :------------------------------------------------------- |
| **Get dependencies** | ${{ steps.get-dependencies.outcome || job.status }} |
| **Generate translations** | ${{ steps.generate-translations.outcome || job.status }} |
| **Generate code files** | ${{ steps.generate-code-files.outcome || job.status }} |
| **Build** | ${{ steps.flutter-build.outcome }} |
### ⚙️ Workflow Configuration
| Parameter | Value |
| :--------------- | :--------------------------------------- |
| App flavor | ${{ inputs.app-flavor }} |
| Flutter version | ${{ inputs.flutter-version }} |
| Flutter channel | ${{ inputs.flutter-channel }} |
- name: Upload Artifact
if: steps.flutter-build.outcome == 'success' if: steps.flutter-build.outcome == 'success'
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: revanced-manager-(${{ env.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavor }}-${{ inputs.flutter-version }}) name: revanced-manager-(${{ env.COMMIT_HASH }}
path: | path: |
build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk build/app/outputs/flutter-apk/app-*.apk
build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk.sha1

View File

@ -12,6 +12,8 @@ env:
jobs: jobs:
pull-request: pull-request:
name: Open pull request name: Open pull request
permissions:
pull-requests: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
@ -25,4 +27,3 @@ jobs:
pr_body: | pr_body: |
This pull request will ${{ env.MESSAGE }}. This pull request will ${{ env.MESSAGE }}.
pr_draft: true pr_draft: true
github_token: ${{ secrets.REPOSITORY_PUSH_ACCESS }}

View File

@ -6,19 +6,13 @@ on:
branches: branches:
- main - main
- dev - dev
paths:
- ".github/workflows/release.yml"
- "android/**"
- "assets/**"
- "lib/**"
- "pubspec.yaml"
jobs: jobs:
release: release:
name: Release name: Release
permissions: permissions:
id-token: write
contents: write contents: write
id-token: write
attestations: write attestations: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
@ -28,7 +22,10 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Setup Java - name: Setup Java
run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v4 uses: actions/setup-node@v4
@ -40,6 +37,12 @@ jobs:
uses: subosito/flutter-action@v2 uses: subosito/flutter-action@v2
with: with:
channel: stable channel: stable
cache: true
- name: Cache Gradle
uses: burrunan/gradle-cache-action@v1
with:
home-directory: ${{ github.workspace }}/android
- name: Install dependencies - name: Install dependencies
run: npm ci run: npm ci
@ -57,17 +60,17 @@ jobs:
run: | run: |
echo "${{ secrets.KEYSTORE }}" | base64 --decode > "android/app/keystore.jks" echo "${{ secrets.KEYSTORE }}" | base64 --decode > "android/app/keystore.jks"
- name: Release - name: Semantic Release
uses: cycjimmy/semantic-release-action@v4
id: semantic
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }} KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }} KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }} KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
run: |
npx semantic-release
- name: Generate artifact attestation - name: Attest
if: github.ref == 'refs/heads/main' if: steps.semantic.outputs.new_release_published == 'true'
uses: actions/attest-build-provenance@v1 uses: actions/attest-build-provenance@v2
with: with:
subject-path: build/app/outputs/apk/release/revanced-manager-*.apk subject-path: build/app/outputs/apk/release/revanced-manager-*.apk

1
.gitignore vendored
View File

@ -43,6 +43,7 @@ app.*.map.json
/android/app/release /android/app/release
# Generated files # Generated files
android/app/.cxx
**/*.g.dart **/*.g.dart
**/*.locator.dart **/*.locator.dart
**/*.router.dart **/*.router.dart

View File

@ -15,6 +15,7 @@ analyzer:
- lib/app/app.router.dart - lib/app/app.router.dart
- lib/models/patch.g.dart - lib/models/patch.g.dart
- lib/models/patched_application.g.dart - lib/models/patched_application.g.dart
- lib/gen/
linter: linter:
rules: rules:

View File

@ -12,3 +12,6 @@
-dontwarn com.google.j2objc.annotations.* -dontwarn com.google.j2objc.annotations.*
-dontwarn java.awt.** -dontwarn java.awt.**
-dontwarn javax.** -dontwarn javax.**
# Keep this for Share Plus or else you can't share log in Settings
-keep interface android.content.res.XmlResourceParser { *; }

View File

@ -9,7 +9,6 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import app.revanced.library.ApkUtils import app.revanced.library.ApkUtils
import app.revanced.library.ApkUtils.applyTo import app.revanced.library.ApkUtils.applyTo
import app.revanced.library.installation.installer.LocalInstaller
import app.revanced.manager.flutter.utils.Aapt import app.revanced.manager.flutter.utils.Aapt
import app.revanced.manager.flutter.utils.packageInstaller.InstallerReceiver import app.revanced.manager.flutter.utils.packageInstaller.InstallerReceiver
import app.revanced.manager.flutter.utils.packageInstaller.UninstallerReceiver import app.revanced.manager.flutter.utils.packageInstaller.UninstallerReceiver
@ -169,7 +168,8 @@ class MainActivity : FlutterActivity() {
putValue(option.default) putValue(option.default)
option.values?.let { values -> option.values?.let { values ->
put("values", put(
"values",
JSONObject().apply { JSONObject().apply {
values.forEach { (key, value) -> values.forEach { (key, value) ->
putValue(value, key) putValue(value, key)
@ -257,16 +257,19 @@ class MainActivity : FlutterActivity() {
// Setup logger // Setup logger
Logger.getLogger("").apply { Logger.getLogger("").apply {
handlers.forEach { handlers.forEach { handler ->
it.close() handler.close()
removeHandler(it) removeHandler(handler)
} }
object : java.util.logging.Handler() { object : java.util.logging.Handler() {
override fun publish(record: LogRecord) { override fun publish(record: LogRecord) {
if (record.loggerName?.startsWith("app.revanced") != true || cancel) return if (cancel) return
if (
updateProgress(-1.0, "", record.message) record.loggerName?.startsWith("app.revanced") == true ||
// Logger in class brut.util.OS.
record.loggerName == ""
) updateProgress(-1.0, "", record.message)
} }
override fun flush() = Unit override fun flush() = Unit

3
devtools_options.yaml Normal file
View File

@ -0,0 +1,3 @@
description: This file stores settings for Dart & Flutter DevTools.
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
extensions:

View File

@ -85,7 +85,7 @@ class _IntAndStringPatchOptionState extends State<IntAndStringPatchOption> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
TextFieldForPatchOption( TextFieldForPatchOption(
value: value, value: value.toString(),
patchOption: widget.patchOption, patchOption: widget.patchOption,
selectedKey: getKey(), selectedKey: getKey(),
onChanged: (value) { onChanged: (value) {

View File

@ -1,3 +1,4 @@
import 'package:flutter/foundation.dart';
import 'package:revanced_manager/app/app.locator.dart'; import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/models/patch.dart'; import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/models/patched_application.dart'; import 'package:revanced_manager/models/patched_application.dart';
@ -17,12 +18,12 @@ bool isPatchSupported(Patch patch) {
bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) { bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) {
final List<String> requiredOptionsType = []; final List<String> requiredOptionsType = [];
final List<String> supportedOptionsType = [ final List<String> supportedOptionsType = [
'String', 'kotlin.String',
'Boolean', 'kotlin.Int',
'Int', 'kotlin.Boolean',
'StringArray', 'kotlin.StringArray',
'IntArray', 'kotlin.IntArray',
'LongArray', 'kotlin.LongArray',
]; ];
for (final Option option in options) { for (final Option option in options) {
if (option.required && if (option.required &&
@ -38,6 +39,9 @@ bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) {
} }
for (final String optionType in requiredOptionsType) { for (final String optionType in requiredOptionsType) {
if (!supportedOptionsType.contains(optionType)) { if (!supportedOptionsType.contains(optionType)) {
if (kDebugMode) {
print('${patch.name} has unsupported required patch option: $requiredOptionsType');
}
return true; return true;
} }
} }

View File

@ -4,7 +4,7 @@ homepage: https://revanced.app
publish_to: 'none' publish_to: 'none'
version: 1.24.0+101800055 version: 1.24.1-dev.4+101800059
environment: environment:
sdk: '>=3.7.0' sdk: '>=3.7.0'