mirror of
https://github.com/revanced/revanced-manager.git
synced 2025-05-02 06:44:25 +02:00
Compare commits
13 Commits
main
...
v1.24.1-de
Author | SHA1 | Date | |
---|---|---|---|
![]() |
10f35eb727 | ||
![]() |
5c7d52c8e9 | ||
![]() |
841d61278b | ||
![]() |
534e4c2453 | ||
![]() |
062f28387f | ||
![]() |
a8a4ffabed | ||
![]() |
cde3f8d62c | ||
![]() |
8182228a46 | ||
![]() |
7fa5daf623 | ||
![]() |
221e663e47 | ||
![]() |
915ec0e260 | ||
![]() |
783f313ed8 | ||
![]() |
05575cccfb |
85
.github/workflows/build_pull_request.yml
vendored
85
.github/workflows/build_pull_request.yml
vendored
@ -3,42 +3,18 @@ name: Build pull request
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
# Select pull request
|
||||
pr-number:
|
||||
description: PR number (Without hashtag)
|
||||
description: PR number
|
||||
required: true
|
||||
# Select app flavor
|
||||
app-flavor:
|
||||
description: App flavor
|
||||
default: 'release'
|
||||
default: release
|
||||
type: choice
|
||||
options:
|
||||
- release
|
||||
- debug
|
||||
- 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:
|
||||
build:
|
||||
name: Build
|
||||
@ -62,76 +38,27 @@ jobs:
|
||||
- name: Set up Flutter
|
||||
uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: ${{ inputs.flutter-channel }}
|
||||
flutter-version: ${{ inputs.flutter-version }}
|
||||
channel: stable
|
||||
|
||||
- name: Get dependencies
|
||||
continue-on-error: true
|
||||
run: flutter pub get
|
||||
|
||||
- name: Generate translations
|
||||
continue-on-error: true
|
||||
run: dart run slang
|
||||
|
||||
- name: Generate code files
|
||||
continue-on-error: true
|
||||
run: dart run build_runner build --delete-conflicting-outputs
|
||||
|
||||
- name: Build
|
||||
continue-on-error: true
|
||||
id: flutter-build
|
||||
run: flutter build apk --${{ inputs.app-flavor }}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- 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
|
||||
- name: Upload artifacts
|
||||
if: steps.flutter-build.outcome == 'success'
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: revanced-manager-(${{ env.COMMIT_HASH }}-${{ inputs.pr-number }}-${{ inputs.app-flavor }}-${{ inputs.flutter-version }})
|
||||
name: revanced-manager-(${{ env.COMMIT_HASH }}
|
||||
path: |
|
||||
build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk
|
||||
build/app/outputs/flutter-apk/app-${{ inputs.app-flavor }}.apk.sha1
|
||||
build/app/outputs/flutter-apk/app-*.apk
|
||||
|
3
.github/workflows/open_pull_request.yml
vendored
3
.github/workflows/open_pull_request.yml
vendored
@ -12,6 +12,8 @@ env:
|
||||
jobs:
|
||||
pull-request:
|
||||
name: Open pull request
|
||||
permissions:
|
||||
pull-requests: write
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
@ -25,4 +27,3 @@ jobs:
|
||||
pr_body: |
|
||||
This pull request will ${{ env.MESSAGE }}.
|
||||
pr_draft: true
|
||||
github_token: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
|
||||
|
31
.github/workflows/release.yml
vendored
31
.github/workflows/release.yml
vendored
@ -6,19 +6,13 @@ on:
|
||||
branches:
|
||||
- main
|
||||
- dev
|
||||
paths:
|
||||
- ".github/workflows/release.yml"
|
||||
- "android/**"
|
||||
- "assets/**"
|
||||
- "lib/**"
|
||||
- "pubspec.yaml"
|
||||
|
||||
jobs:
|
||||
release:
|
||||
name: Release
|
||||
permissions:
|
||||
id-token: write
|
||||
contents: write
|
||||
id-token: write
|
||||
attestations: write
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
@ -28,7 +22,10 @@ jobs:
|
||||
fetch-depth: 0
|
||||
|
||||
- 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
|
||||
uses: actions/setup-node@v4
|
||||
@ -40,6 +37,12 @@ jobs:
|
||||
uses: subosito/flutter-action@v2
|
||||
with:
|
||||
channel: stable
|
||||
cache: true
|
||||
|
||||
- name: Cache Gradle
|
||||
uses: burrunan/gradle-cache-action@v1
|
||||
with:
|
||||
home-directory: ${{ github.workspace }}/android
|
||||
|
||||
- name: Install dependencies
|
||||
run: npm ci
|
||||
@ -57,17 +60,17 @@ jobs:
|
||||
run: |
|
||||
echo "${{ secrets.KEYSTORE }}" | base64 --decode > "android/app/keystore.jks"
|
||||
|
||||
- name: Release
|
||||
- name: Semantic Release
|
||||
uses: cycjimmy/semantic-release-action@v4
|
||||
id: semantic
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||
KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
|
||||
KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
|
||||
run: |
|
||||
npx semantic-release
|
||||
|
||||
- name: Generate artifact attestation
|
||||
if: github.ref == 'refs/heads/main'
|
||||
uses: actions/attest-build-provenance@v1
|
||||
- name: Attest
|
||||
if: steps.semantic.outputs.new_release_published == 'true'
|
||||
uses: actions/attest-build-provenance@v2
|
||||
with:
|
||||
subject-path: build/app/outputs/apk/release/revanced-manager-*.apk
|
||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -43,6 +43,7 @@ app.*.map.json
|
||||
/android/app/release
|
||||
|
||||
# Generated files
|
||||
android/app/.cxx
|
||||
**/*.g.dart
|
||||
**/*.locator.dart
|
||||
**/*.router.dart
|
||||
|
@ -15,6 +15,7 @@ analyzer:
|
||||
- lib/app/app.router.dart
|
||||
- lib/models/patch.g.dart
|
||||
- lib/models/patched_application.g.dart
|
||||
- lib/gen/
|
||||
|
||||
linter:
|
||||
rules:
|
||||
|
3
android/app/proguard-rules.pro
vendored
3
android/app/proguard-rules.pro
vendored
@ -12,3 +12,6 @@
|
||||
-dontwarn com.google.j2objc.annotations.*
|
||||
-dontwarn java.awt.**
|
||||
-dontwarn javax.**
|
||||
|
||||
# Keep this for Share Plus or else you can't share log in Settings
|
||||
-keep interface android.content.res.XmlResourceParser { *; }
|
||||
|
@ -9,7 +9,6 @@ import android.os.Handler
|
||||
import android.os.Looper
|
||||
import app.revanced.library.ApkUtils
|
||||
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.packageInstaller.InstallerReceiver
|
||||
import app.revanced.manager.flutter.utils.packageInstaller.UninstallerReceiver
|
||||
@ -169,7 +168,8 @@ class MainActivity : FlutterActivity() {
|
||||
putValue(option.default)
|
||||
|
||||
option.values?.let { values ->
|
||||
put("values",
|
||||
put(
|
||||
"values",
|
||||
JSONObject().apply {
|
||||
values.forEach { (key, value) ->
|
||||
putValue(value, key)
|
||||
@ -257,16 +257,19 @@ class MainActivity : FlutterActivity() {
|
||||
|
||||
// Setup logger
|
||||
Logger.getLogger("").apply {
|
||||
handlers.forEach {
|
||||
it.close()
|
||||
removeHandler(it)
|
||||
handlers.forEach { handler ->
|
||||
handler.close()
|
||||
removeHandler(handler)
|
||||
}
|
||||
|
||||
object : java.util.logging.Handler() {
|
||||
override fun publish(record: LogRecord) {
|
||||
if (record.loggerName?.startsWith("app.revanced") != true || cancel) return
|
||||
|
||||
updateProgress(-1.0, "", record.message)
|
||||
if (cancel) return
|
||||
if (
|
||||
record.loggerName?.startsWith("app.revanced") == true ||
|
||||
// Logger in class brut.util.OS.
|
||||
record.loggerName == ""
|
||||
) updateProgress(-1.0, "", record.message)
|
||||
}
|
||||
|
||||
override fun flush() = Unit
|
||||
|
3
devtools_options.yaml
Normal file
3
devtools_options.yaml
Normal 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:
|
@ -85,7 +85,7 @@ class _IntAndStringPatchOptionState extends State<IntAndStringPatchOption> {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
TextFieldForPatchOption(
|
||||
value: value,
|
||||
value: value.toString(),
|
||||
patchOption: widget.patchOption,
|
||||
selectedKey: getKey(),
|
||||
onChanged: (value) {
|
||||
|
@ -1,3 +1,4 @@
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:revanced_manager/app/app.locator.dart';
|
||||
import 'package:revanced_manager/models/patch.dart';
|
||||
import 'package:revanced_manager/models/patched_application.dart';
|
||||
@ -17,12 +18,12 @@ bool isPatchSupported(Patch patch) {
|
||||
bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) {
|
||||
final List<String> requiredOptionsType = [];
|
||||
final List<String> supportedOptionsType = [
|
||||
'String',
|
||||
'Boolean',
|
||||
'Int',
|
||||
'StringArray',
|
||||
'IntArray',
|
||||
'LongArray',
|
||||
'kotlin.String',
|
||||
'kotlin.Int',
|
||||
'kotlin.Boolean',
|
||||
'kotlin.StringArray',
|
||||
'kotlin.IntArray',
|
||||
'kotlin.LongArray',
|
||||
];
|
||||
for (final Option option in options) {
|
||||
if (option.required &&
|
||||
@ -38,6 +39,9 @@ bool hasUnsupportedRequiredOption(List<Option> options, Patch patch) {
|
||||
}
|
||||
for (final String optionType in requiredOptionsType) {
|
||||
if (!supportedOptionsType.contains(optionType)) {
|
||||
if (kDebugMode) {
|
||||
print('${patch.name} has unsupported required patch option: $requiredOptionsType');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
@ -4,7 +4,7 @@ homepage: https://revanced.app
|
||||
|
||||
publish_to: 'none'
|
||||
|
||||
version: 1.24.0+101800055
|
||||
version: 1.24.1-dev.4+101800059
|
||||
|
||||
environment:
|
||||
sdk: '>=3.7.0'
|
||||
|
Loading…
x
Reference in New Issue
Block a user