mirror of
https://github.com/revanced/revanced-manager.git
synced 2025-05-02 14:54:25 +02:00
Compare commits
No commits in common. "v1.24.1-dev.4" and "main" have entirely different histories.
v1.24.1-de
...
main
85
.github/workflows/build_pull_request.yml
vendored
85
.github/workflows/build_pull_request.yml
vendored
@ -3,18 +3,42 @@ name: Build pull request
|
|||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
|
# Select pull request
|
||||||
pr-number:
|
pr-number:
|
||||||
description: PR number
|
description: PR number (Without hashtag)
|
||||||
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
|
||||||
@ -38,27 +62,76 @@ jobs:
|
|||||||
- name: Set up Flutter
|
- name: Set up Flutter
|
||||||
uses: subosito/flutter-action@v2
|
uses: subosito/flutter-action@v2
|
||||||
with:
|
with:
|
||||||
channel: stable
|
channel: ${{ inputs.flutter-channel }}
|
||||||
|
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: Upload artifacts
|
- name: Prepare comment
|
||||||
|
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 }}
|
name: revanced-manager-(${{ env.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavor }}-${{ inputs.flutter-version }})
|
||||||
path: |
|
path: |
|
||||||
build/app/outputs/flutter-apk/app-*.apk
|
build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk
|
||||||
|
build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk.sha1
|
||||||
|
3
.github/workflows/open_pull_request.yml
vendored
3
.github/workflows/open_pull_request.yml
vendored
@ -12,8 +12,6 @@ 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
|
||||||
@ -27,3 +25,4 @@ 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 }}
|
||||||
|
31
.github/workflows/release.yml
vendored
31
.github/workflows/release.yml
vendored
@ -6,13 +6,19 @@ 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:
|
||||||
contents: write
|
|
||||||
id-token: write
|
id-token: write
|
||||||
|
contents: write
|
||||||
attestations: write
|
attestations: write
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
@ -22,10 +28,7 @@ jobs:
|
|||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v4
|
run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
|
||||||
with:
|
|
||||||
distribution: 'temurin'
|
|
||||||
java-version: '17'
|
|
||||||
|
|
||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
@ -37,12 +40,6 @@ 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
|
||||||
@ -60,17 +57,17 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.KEYSTORE }}" | base64 --decode > "android/app/keystore.jks"
|
echo "${{ secrets.KEYSTORE }}" | base64 --decode > "android/app/keystore.jks"
|
||||||
|
|
||||||
- name: Semantic Release
|
- name: 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: Attest
|
- name: Generate artifact attestation
|
||||||
if: steps.semantic.outputs.new_release_published == 'true'
|
if: github.ref == 'refs/heads/main'
|
||||||
uses: actions/attest-build-provenance@v2
|
uses: actions/attest-build-provenance@v1
|
||||||
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
1
.gitignore
vendored
@ -43,7 +43,6 @@ 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
|
||||||
|
@ -15,7 +15,6 @@ 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:
|
||||||
|
3
android/app/proguard-rules.pro
vendored
3
android/app/proguard-rules.pro
vendored
@ -12,6 +12,3 @@
|
|||||||
-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 { *; }
|
|
||||||
|
@ -9,6 +9,7 @@ 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
|
||||||
@ -168,8 +169,7 @@ class MainActivity : FlutterActivity() {
|
|||||||
putValue(option.default)
|
putValue(option.default)
|
||||||
|
|
||||||
option.values?.let { values ->
|
option.values?.let { values ->
|
||||||
put(
|
put("values",
|
||||||
"values",
|
|
||||||
JSONObject().apply {
|
JSONObject().apply {
|
||||||
values.forEach { (key, value) ->
|
values.forEach { (key, value) ->
|
||||||
putValue(value, key)
|
putValue(value, key)
|
||||||
@ -257,19 +257,16 @@ class MainActivity : FlutterActivity() {
|
|||||||
|
|
||||||
// Setup logger
|
// Setup logger
|
||||||
Logger.getLogger("").apply {
|
Logger.getLogger("").apply {
|
||||||
handlers.forEach { handler ->
|
handlers.forEach {
|
||||||
handler.close()
|
it.close()
|
||||||
removeHandler(handler)
|
removeHandler(it)
|
||||||
}
|
}
|
||||||
|
|
||||||
object : java.util.logging.Handler() {
|
object : java.util.logging.Handler() {
|
||||||
override fun publish(record: LogRecord) {
|
override fun publish(record: LogRecord) {
|
||||||
if (cancel) return
|
if (record.loggerName?.startsWith("app.revanced") != true || cancel) return
|
||||||
if (
|
|
||||||
record.loggerName?.startsWith("app.revanced") == true ||
|
updateProgress(-1.0, "", record.message)
|
||||||
// Logger in class brut.util.OS.
|
|
||||||
record.loggerName == ""
|
|
||||||
) updateProgress(-1.0, "", record.message)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun flush() = Unit
|
override fun flush() = Unit
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
description: This file stores settings for Dart & Flutter DevTools.
|
|
||||||
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
|
|
||||||
extensions:
|
|
@ -85,7 +85,7 @@ class _IntAndStringPatchOptionState extends State<IntAndStringPatchOption> {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
TextFieldForPatchOption(
|
TextFieldForPatchOption(
|
||||||
value: value.toString(),
|
value: value,
|
||||||
patchOption: widget.patchOption,
|
patchOption: widget.patchOption,
|
||||||
selectedKey: getKey(),
|
selectedKey: getKey(),
|
||||||
onChanged: (value) {
|
onChanged: (value) {
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
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';
|
||||||
@ -18,12 +17,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 = [
|
||||||
'kotlin.String',
|
'String',
|
||||||
'kotlin.Int',
|
'Boolean',
|
||||||
'kotlin.Boolean',
|
'Int',
|
||||||
'kotlin.StringArray',
|
'StringArray',
|
||||||
'kotlin.IntArray',
|
'IntArray',
|
||||||
'kotlin.LongArray',
|
'LongArray',
|
||||||
];
|
];
|
||||||
for (final Option option in options) {
|
for (final Option option in options) {
|
||||||
if (option.required &&
|
if (option.required &&
|
||||||
@ -39,9 +38,6 @@ 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ homepage: https://revanced.app
|
|||||||
|
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
|
|
||||||
version: 1.24.1-dev.4+101800059
|
version: 1.24.0+101800055
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: '>=3.7.0'
|
sdk: '>=3.7.0'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user