chore: Modernize project setup

Update dependencies, move to Gradle KTs and overall improve build and project files.
2025-04-29 13:34:25 +02:00 · 2024-10-06 02:39:32 +02:00 · 2024-10-06 02:39:32 +02:00 · 820cd720b5
commit 820cd720b5
parent 31ff1e0492
31 changed files with 291 additions and 536 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -16,6 +16,8 @@ on:
 jobs:
  release:
    name: Release
+    permissions:
+        contents: write
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@ -35,8 +37,7 @@ jobs:
      - name: Set up Flutter
        uses: subosito/flutter-action@v2
        with:
-          channel: "stable"
-          flutter-version: 3.24.x
+          channel: stable

      - name: Install dependencies
        run: npm ci
@ -50,13 +51,15 @@ jobs:
      - name: Generate code files
        run: dart run build_runner build --delete-conflicting-outputs

+      - name: Setup keystore
+        run: |
+          echo "${{ secrets.KEYSTORE }}" | base64 --decode > "keystore.jks"}
+
      - name: Release
        env:
-          GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
-          signingKey: "keystore.jks"
-          keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
-          keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
-          keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
+          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: |
-          echo "${{ secrets.SIGNING_KEYSTORE }}" | base64 --decode > android/app/keystore.jks
          npx semantic-release
--- a/.gitignore
+++ b/.gitignore
@ -1,41 +1,14 @@
-# See https://www.dartlang.org/guides/libraries/private-files
-
-# Files and directories created by pub
-.dart_tool/
-.packages
-build/
-# If you're building an application, you may want to check-in your pubspec.lock
-# pubspec.lock
-
-# Directory created by dartdoc
-# If you don't generate documentation locally you can remove this line.
-doc/api/
-
-# dotenv environment variables file
-.env*
-
-# Avoid committing generated Javascript files:
-*.dart.js
-*.info.json      # Produced by the --dump-info flag.
-*.js             # When generated by dart2js. Don't specify *.js if your
-                 # project includes source files written in JavaScript.
-*.js_
-*.js.deps
-*.js.map
-
-.flutter-plugins
-.flutter-plugins-dependencies
-
-# Generated Builder file
-**/*.g.dart
-**/*.locator.dart
-**/*.router.dart
-
-flutter_*.png
-
-#### Custom
-
-local.properties
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/

 # IntelliJ related
 *.iml
@ -43,8 +16,39 @@ local.properties
 *.iws
 .idea/

-# Node Dependency directories
-node_modules/
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
+
+# Generated files
+**/*.g.dart
+**/*.locator.dart
+**/*.router.dart
+
+# Project specific
+node_modules/
+.vscode/
+

-# FVM
-.fvm
--- a/.metadata
+++ b/.metadata
@ -1,11 +1,11 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.

 version:
-  revision: 85684f9300908116a78138ea4c6036c35c9a1236
-  channel: stable
+  revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
+  channel: "stable"

 project_type: app

@ -13,26 +13,11 @@ project_type: app
 migration:
  platforms:
    - platform: root
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
    - platform: android
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-    - platform: ios
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-    - platform: linux
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-    - platform: macos
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-    - platform: web
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-    - platform: windows
-      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
-      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
+      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730

  # User provided section

--- a/.releaserc
+++ b/.releaserc
@ -48,7 +48,8 @@
        "assets": [
          {
            "path": "build/app/outputs/apk/release/revanced-manager*.apk"
-          }
+          },
+          "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
        ],
        "successComment": false
      }
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@ -1,91 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Generate (Builder)",
-            "type": "shell",
-            "command": "flutter packages pub run build_runner build --delete-conflicting-outputs",
-            "problemMatcher": []
-        },
-        {
-            "label": "Build (Android)",
-            "type": "shell",
-            "command": "flutter build apk",
-            "problemMatcher": [],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        },
-        {
-            "label": "Install (Android)",
-            "type": "shell",
-            "command": "adb install build\\app\\outputs\\flutter-apk\\app-release.apk",
-            "problemMatcher": []
-        },
-        {
-            "label": "Clean (Flutter)",
-            "type": "shell",
-            "command": "flutter clean && flutter pub get",
-            "problemMatcher": []
-        },
-        {
-            "label": "Clean (Builder)",
-            "type": "shell",
-            "command": "flutter packages pub run build_runner clean",
-            "problemMatcher": []
-        },
-        {
-            "label": "Build all (Android)",
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "Generate (Builder)",
-                "Build (Android)"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Clean all",
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "Clean (Flutter)",
-                "Clean (Builder)"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Clean all & Build all (Android)",
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "Clean all",
-                "Build all (Android)"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Clean all & Install (Android)",
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "Clean all",
-                "Build all (Android)",
-                "Install (Android)",
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Build & Install (Android)",
-            "dependsOrder": "sequence",
-            "dependsOn": [
-                "Build (Android)",
-                "Install (Android)"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Validate translations",
-            "type": "shell",
-            "command": "flutter pub run flutter_i18n diff en.json pt.json",
-            "problemMatcher": []
-        }
-    ]
-}
--- a/android/.gitignore
+++ b/android/.gitignore
@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java

 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks
--- a/android/Gemfile
+++ b/android/Gemfile
@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane"
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -1,114 +0,0 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-android {
-    compileSdk 34
-
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
-    defaultConfig {
-        applicationId "app.revanced.manager.flutter"
-        minSdk 26
-        targetSdk 34
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-    }
-    buildTypes {
-        configureEach {
-            shrinkResources = false
-            minifyEnabled = false
-            signingConfig signingConfigs.debug
-            ndk {
-                abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86_64'
-            }
-        }
-        release {
-            shrinkResources true
-            minifyEnabled true
-            if (System.getenv("signingKey") != null) {
-                signingConfigs {
-                    create("release") {
-                        storeFile = file(System.getenv("signingKey"))
-                        storePassword = System.getenv("keyStorePassword")
-                        keyAlias = System.getenv("keyAlias")
-                        keyPassword = System.getenv("keyPassword")
-                    }
-                }
-                signingConfig = signingConfigs.release
-                resValue "string", "app_name", "ReVanced Manager"
-                applicationVariants.all { variant ->
-                    variant.outputs.all {
-                        outputFileName = "revanced-manager-v${flutterVersionName}.apk"
-                    }
-                }
-            } else {
-                signingConfig = signingConfigs.debug
-                resValue "string", "app_name", "ReVanced Manager (Debug)"
-                applicationIdSuffix ".debug"
-            }
-        }
-        debug {
-            resValue "string", "app_name", "ReVanced Manager (Debug)"
-            applicationIdSuffix ".debug"
-        }
-        profile {
-            resValue "string", "app_name", "ReVanced Manager (Profile)"
-            applicationIdSuffix ".profile"
-        }
-    }
-    packagingOptions {
-        jniLibs {
-            useLegacyPackaging true
-            excludes += ['/prebuilt/**']
-        }
-        resources {
-            excludes += ['/prebuilt/**']
-        }
-    }
-
-    namespace 'app.revanced.manager.flutter'
-}
-
-kotlin {
-    jvmToolchain(17)
-}
-
-flutter {
-    source '../..'
-}
-
-dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") // https://pub.dev/packages/flutter_local_notifications#gradle-setup
-    implementation("app.revanced:revanced-patcher:19.3.1")
-    implementation("app.revanced:revanced-library:2.2.1")
-}
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@ -0,0 +1,91 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "app.revanced.manager.flutter"
+    compileSdk = 34
+    ndkVersion = "27.0.12077973"
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    defaultConfig {
+        applicationId = "app.revanced.manager.flutter"
+        minSdk = 26
+        targetSdk = 34
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        configureEach {
+            isShrinkResources = false
+            isMinifyEnabled = false
+
+            signingConfig = signingConfigs["debug"]
+
+            ndk.abiFilters += setOf("armeabi-v7a", "arm64-v8a", "x86_64")
+        }
+
+        release {
+            isShrinkResources = true
+            isMinifyEnabled = true
+
+            val keystoreFile = file("keystore.jks")
+            if (keystoreFile.exists()) {
+                signingConfig = signingConfigs.create("release") {
+                    storeFile = keystoreFile
+                    storePassword = System.getenv("KEYSTORE_PASSWORD")
+                    keyAlias = System.getenv("KEYSTORE_ENTRY_ALIAS")
+                    keyPassword = System.getenv("KEYSTORE_ENTRY_PASSWORD")
+                }
+            } else {
+                resValue("string", "app_name", "ReVanced Manager (Debug)")
+                applicationIdSuffix = ".debug"
+
+                signingConfig = signingConfigs["debug"]
+            }
+
+            resValue("string", "app_name", "ReVanced Manager")
+        }
+
+        debug {
+            resValue("string", "app_name", "ReVanced Manager (Debug)")
+            applicationIdSuffix = ".debug"
+        }
+    }
+
+    packaging {
+        jniLibs {
+            useLegacyPackaging = true
+            excludes.add("/prebuilt/**")
+        }
+
+        resources {
+            excludes.add("/prebuilt/**")
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
+
+dependencies {
+    coreLibraryDesugaring(libs.desugar.jdk.libs) // https://pub.dev/packages/flutter_local_notifications#gradle-setup
+    implementation(libs.revanced.patcher)
+    implementation(libs.revanced.library)
+}
+
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@ -1,10 +1,3 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.kts.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
 -dontobfuscate

 -keep class app.revanced.** { *; }
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@ -1,3 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
    <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@ -1,3 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
+         to allow setting breakpoints, to provide hot reload, etc.
+    -->
    <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,48 +0,0 @@
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven {
-            // A repository must be speficied for some reason. "registry" is a dummy.
-            url = uri("https://maven.pkg.github.com/revanced/registry")
-            credentials {
-                username = project.findProperty("gpr.user") as String ?: System.getenv("GITHUB_ACTOR")
-                password = project.findProperty("gpr.key") as String ?: System.getenv("GITHUB_TOKEN")
-            }
-        }
-        mavenLocal()
-    }
-}
-
-rootProject.buildDir = '../build'
-// TODO: Bump SDK
-//       Reference: https://github.com/flutter/flutter/issues/153281#issuecomment-2292201697
-subprojects {
-    afterEvaluate { project ->
-        if (project.extensions.findByName("android") != null) {
-            Integer pluginCompileSdk = project.android.compileSdk
-            if (pluginCompileSdk != null && pluginCompileSdk < 31) {
-                project.logger.error(
-                        "Warning: Overriding compileSdk version in Flutter plugin: "
-                                + project.name
-                                + " from "
-                                + pluginCompileSdk
-                                + " to 31 (to work around https://issuetracker.google.com/issues/199180389)."
-                                + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
-                                + project.name
-                                + " to increase their compileSdk to the latest (otherwise try updating to the latest version)."
-                )
-                project.android {
-                    compileSdk 31
-                }
-            }
-        }
-    }
-    
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
-    project.evaluationDependsOn(":app")
-}
-
-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@ -0,0 +1,30 @@
+import com.android.build.api.dsl.CommonExtension
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/revanced/registry")
+            credentials {
+                username = providers.gradleProperty("gpr.user").orNull ?: System.getenv("GITHUB_ACTOR")
+                password = providers.gradleProperty("gpr.key").orNull ?: System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
+
+layout.buildDirectory = File("../build")
+
+subprojects {
+    afterEvaluate {
+        extensions.findByName("android")?.let {
+            it as CommonExtension<*, *, *, *, *, *>
+            it.compileSdk = 34
+        }
+    }
+
+    layout.buildDirectory = rootProject.layout.buildDirectory.file(name).get().asFile
+    evaluationDependsOn(":app")
+}
--- a/android/gradle.properties
+++ b/android/gradle.properties
@ -1,8 +1,8 @@
-org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+android.useAndroidX=true
 org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.caching=true
-android.useAndroidX=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@ -0,0 +1,9 @@
+[versions]
+revanced-patcher = "19.3.1" # TODO: Update to non-dev
+revanced-library = "2.2.1"
+desugar_jdk_libs = "2.1.2"
+
+[libraries]
+revanced-patcher = { module = "app.revanced:revanced-patcher", version.ref = "revanced-patcher" }
+revanced-library = { module = "app.revanced:revanced-library", version.ref = "revanced-library" }
+desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -1,25 +0,0 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
-
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.5.1" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.0" apply false
-}
-
-include ":app"
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@ -0,0 +1,24 @@
+pluginManagement {
+    val properties = java.util.Properties().apply {
+        load(file("local.properties").inputStream())
+    }
+
+    val flutterSdkPath = properties.getProperty("flutter.sdk")
+    assert(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.7.0" apply false
+    id("org.jetbrains.kotlin.android") version "2.0.20" apply false
+}
+
+include(":app")
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@ -1,2 +0,0 @@
-json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name("app.revanced.manager.flutter") # e.g. com.krausefx.app
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@ -1,38 +0,0 @@
-# This file contains the fastlane.tools configuration
-# You can find the documentation at https://docs.fastlane.tools
-#
-# For a list of all available actions, check out
-#
-#     https://docs.fastlane.tools/actions
-#
-# For a list of all available plugins, check out
-#
-#     https://docs.fastlane.tools/plugins/available-plugins
-#
-
-# Uncomment the line if you want fastlane to automatically update itself
-# update_fastlane
-
-default_platform(:android)
-
-platform :android do
-  desc "Runs all the tests"
-  lane :test do
-    gradle(task: "test")
-  end
-
-  desc "Submit a new Beta Build to Crashlytics Beta"
-  lane :beta do
-    gradle(task: "clean assembleRelease")
-    crashlytics
-  
-    # sh "your_script.sh"
-    # You can also use other beta testing services here
-  end
-
-  desc "Deploy a new version to the Google Play"
-  lane :deploy do
-    gradle(task: "clean assembleRelease")
-    upload_to_play_store
-  end
-end
--- a/fastlane/README.md
+++ b/fastlane/README.md
@ -1,48 +0,0 @@
-fastlane documentation
----
-
-# Installation
-
-Make sure you have the latest version of the Xcode command line tools installed:
-
-```sh
-xcode-select --install
-```
-
-For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane)
-
-# Available Actions
-
-## Android
-
-### android test
-
-```sh
-[bundle exec] fastlane android test
-```
-
-Runs all the tests
-
-### android beta
-
-```sh
-[bundle exec] fastlane android beta
-```
-
-Submit a new Beta Build to Crashlytics Beta
-
-### android deploy
-
-```sh
-[bundle exec] fastlane android deploy
-```
-
-Deploy a new version to the Google Play
-
----
-
-This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
-
-More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools).
-
-The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@ -1 +0,0 @@
-ReVanced Manager is an Android application that uses ReVanced Patcher to add, remove, and modify existing functionalities in Android applications
--- a/fastlane/metadata/android/en-US/images/featureGraphic.png
+++ b/fastlane/metadata/android/en-US/images/featureGraphic.png
--- a/fastlane/metadata/android/en-US/images/icon.png
+++ b/fastlane/metadata/android/en-US/images/icon.png
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
--- a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
+++ b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@ -1 +0,0 @@
-Patch your favorite apps, right on your device.
--- a/fastlane/metadata/android/en-US/title.txt
+++ b/fastlane/metadata/android/en-US/title.txt
@ -1 +0,0 @@
-ReVanced Manager
--- a/fastlane/report.xml
+++ b/fastlane/report.xml
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,10 +5,10 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: "45cfa8471b89fb6643fe9bf51bd7931a76b8f5ec2d65de4fb176dba8d4f22c77"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
      url: "https://pub.dev"
    source: hosted
-    version: "73.0.0"
+    version: "72.0.0"
  _macros:
    dependency: transitive
    description: dart
@ -18,10 +18,10 @@ packages:
    dependency: "direct dev"
    description:
      name: analyzer
-      sha256: "4959fec185fe70cce007c57e9ab6983101dbe593d2bf8bbfb4453aaec0cf470a"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
      url: "https://pub.dev"
    source: hosted
-    version: "6.8.0"
+    version: "6.7.0"
  animations:
    dependency: "direct main"
    description:
@ -90,10 +90,10 @@ packages:
    dependency: "direct dev"
    description:
      name: build_runner
-      sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04
+      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.12"
+    version: "2.4.13"
  build_runner_core:
    dependency: transitive
    description:
@ -154,10 +154,10 @@ packages:
    dependency: "direct main"
    description:
      name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.19.0"
+    version: "1.18.0"
  connectivity_plus:
    dependency: "direct main"
    description:
@ -210,10 +210,10 @@ packages:
    dependency: transitive
    description:
      name: dart_style
-      sha256: "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9"
+      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.6"
+    version: "2.3.7"
  dbus:
    dependency: transitive
    description:
@ -368,18 +368,18 @@ packages:
    dependency: "direct dev"
    description:
      name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
  flutter_local_notifications:
    dependency: "direct main"
    description:
      name: flutter_local_notifications
-      sha256: c500d5d9e7e553f06b61877ca6b9c8b92c570a4c8db371038702e8ce57f8a50f
+      sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71"
      url: "https://pub.dev"
    source: hosted
-    version: "17.2.2"
+    version: "17.2.3"
  flutter_local_notifications_linux:
    dependency: transitive
    description:
@ -405,10 +405,10 @@ packages:
    dependency: "direct main"
    description:
      name: flutter_markdown
-      sha256: a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7
+      sha256: e17575ca576a34b46c58c91f9948891117a1bd97815d2e661813c7f90c647a78
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.3+1"
+    version: "0.7.3+2"
  flutter_plugin_android_lifecycle:
    dependency: transitive
    description:
@ -519,18 +519,18 @@ packages:
    dependency: transitive
    description:
      name: http_parser
-      sha256: "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4"
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
      url: "https://pub.dev"
    source: hosted
-    version: "4.1.0"
+    version: "4.0.2"
  injectable:
    dependency: "direct main"
    description:
      name: injectable
-      sha256: "69874ba3ec10e3a0de3f519a184442878291d928f3299d718813f24642585198"
+      sha256: "5e1556ea1d374fe44cbe846414d9bab346285d3d8a1da5877c01ad0774006068"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.4"
+    version: "2.5.0"
  injectable_generator:
    dependency: "direct dev"
    description:
@ -591,10 +591,10 @@ packages:
    dependency: "direct main"
    description:
      name: language_code
-      sha256: "7272519879a86e64fb5f183716ba10cefeb2f191e6e0aa043e0259d0ca0aa122"
+      sha256: "3993948ea689ec3bc4d3d9286fade89a9f865da38d94d34b5d06d268d4f32fa5"
      url: "https://pub.dev"
    source: hosted
-    version: "0.5.3+2"
+    version: "0.5.5"
  leak_tracker:
    dependency: transitive
    description:
@ -623,10 +623,10 @@ packages:
    dependency: transitive
    description:
      name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
+      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.0"
+    version: "5.0.0"
  logcat:
    dependency: "direct main"
    description:
@ -832,10 +832,10 @@ packages:
    dependency: transitive
    description:
      name: permission_handler_platform_interface
-      sha256: fe0ffe274d665be8e34f9c59705441a7d248edebbe5d9e3ec2665f88b79358ea
+      sha256: e9c8eadee926c4532d0305dff94b85bf961f16759c3af791486613152af4b4f9
      url: "https://pub.dev"
    source: hosted
-    version: "4.2.2"
+    version: "4.2.3"
  permission_handler_windows:
    dependency: transitive
    description:
@ -1010,10 +1010,10 @@ packages:
    dependency: transitive
    description:
      name: shelf
-      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.2"
+    version: "1.4.1"
  shelf_web_socket:
    dependency: transitive
    description:
@ -1040,18 +1040,18 @@ packages:
    dependency: "direct main"
    description:
      name: slang
-      sha256: a2f704508bf9f209b71c881347bd27de45309651e9bd63570e4dd6ed2a77fbd2
+      sha256: a466773de768eb95bdf681e0a92e7c8010d44bb247b62130426c83ece33aeaed
      url: "https://pub.dev"
    source: hosted
-    version: "3.31.2"
+    version: "3.32.0"
  slang_flutter:
    dependency: "direct main"
    description:
      name: slang_flutter
-      sha256: f8400292be49c11697d94af58d7f7d054c91af759f41ffe71e4e5413871ffc62
+      sha256: "1a98e878673996902fa5ef0b61ce5c245e41e4d25640d18af061c6aab917b0c7"
      url: "https://pub.dev"
    source: hosted
-    version: "3.31.0"
+    version: "3.32.0"
  source_gen:
    dependency: transitive
    description:
@ -1088,18 +1088,18 @@ packages:
    dependency: transitive
    description:
      name: sqflite
-      sha256: a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d
+      sha256: ff5a2436ef8ebdfda748fbfe957f9981524cb5ff11e7bafa8c42771840e8a788
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.3+1"
+    version: "2.3.3+2"
  sqflite_common:
    dependency: transitive
    description:
      name: sqflite_common
-      sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e"
+      sha256: "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.4+2"
+    version: "2.5.4+4"
  stack_trace:
    dependency: transitive
    description:
@ -1160,18 +1160,18 @@ packages:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
  synchronized:
    dependency: "direct main"
    description:
      name: synchronized
-      sha256: a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255
+      sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.0"
+    version: "3.3.0+3"
  term_glyph:
    dependency: transitive
    description:
@ -1184,10 +1184,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.3"
+    version: "0.7.2"
  timeago:
    dependency: "direct main"
    description:
@ -1264,10 +1264,10 @@ packages:
    dependency: transitive
    description:
      name: url_launcher_macos
-      sha256: "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de"
+      sha256: "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672"
      url: "https://pub.dev"
    source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
  url_launcher_platform_interface:
    dependency: transitive
    description:
@ -1296,10 +1296,10 @@ packages:
    dependency: transitive
    description:
      name: uuid
-      sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77
+      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
      url: "https://pub.dev"
    source: hosted
-    version: "4.5.0"
+    version: "4.5.1"
  vector_math:
    dependency: transitive
    description:
@ -1312,10 +1312,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.4"
+    version: "14.2.5"
  wakelock_plus:
    dependency: "direct main"
    description:
@ -1344,10 +1344,10 @@ packages:
    dependency: transitive
    description:
      name: web
-      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
  web_socket:
    dependency: transitive
    description:
@ -1368,18 +1368,18 @@ packages:
    dependency: transitive
    description:
      name: win32
-      sha256: "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a"
+      sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec"
      url: "https://pub.dev"
    source: hosted
-    version: "5.5.4"
+    version: "5.5.5"
  win32_registry:
    dependency: transitive
    description:
      name: win32_registry
-      sha256: "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6"
+      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.4"
+    version: "1.1.5"
  xdg_directories:
    dependency: transitive
    description:
@ -1405,5 +1405,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.5.0 <4.0.0"
+  dart: ">=3.5.3 <4.0.0"
  flutter: ">=3.24.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,14 +1,13 @@
 name: revanced_manager
-description: Patch your favorite apps, right on your device.
-homepage: https://github.com/ReVanced/revanced-manager
+description: "Application to use ReVanced on Android."
+homepage: https://revanced.app

 publish_to: 'none'

 version: 1.22.1-dev.2+101800040

 environment:
-  sdk: '>=3.0.0 <4.0.0'
-  flutter: '>=3.24.0 <4.0.0'
+  sdk: ^3.5.3

 dependencies:
  animations: ^2.0.11
@ -17,7 +16,7 @@ dependencies:
  device_apps:
    git:
      url: https://github.com/ponces/flutter_plugin_device_apps
-      ref: 0609662324b9e00931fccfa87e9e1b00b7610907 # Branch: revanced-manager
+      ref: 0609662324b9e00931fccfa87e9e1b00b7610907
  device_info_plus: ^10.1.0
  dio: ^5.4.3+1
  dio_cache_interceptor: ^3.5.0
@ -76,7 +75,7 @@ dependencies:
 dev_dependencies:
  analyzer: ^6.4.1
  build_runner: ^2.4.12
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
  injectable_generator: ^2.6.1
  json_serializable: ^6.8.0
				`@ -1 +0,0 @@`
				`ReVanced Manager is an Android application that uses ReVanced Patcher to add, remove, and modify existing functionalities in Android applications`
				`@ -1 +0,0 @@`
				`Patch your favorite apps, right on your device.`