Merge branch 'dev' into feat/patch-history

.github/dependabot.yml

@@ -0,0 +1,29 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly
+
+  - package-ecosystem: npm
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly
+
+  - package-ecosystem: pub
+    labels: []
+    directory: /
+    target-branch: dev
+    schedule:
+      interval: monthly
+
+  - package-ecosystem: gradle
+    labels: [ "ReVanced Manager Compose" ]
+    directory: /
+    target-branch: compose-dev
+    schedule:
+      interval: monthly

.github/workflows/release-build.yml

@@ -11,7 +11,6 @@ on:
       - "android/**"
       - "assets/**"
       - "lib/**"
-      - ".releaserc.js"
       - "pubspec.yaml"
 
 jobs:
@@ -26,6 +25,11 @@ jobs:
           java-version: "17"
           distribution: "zulu"
 
+      - name: Set up Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"
@@ -57,8 +61,3 @@ jobs:
         run: |
           echo "${{ secrets.SIGNING_KEYSTORE }}" | base64 --decode > android/app/keystore.jks
           npx semantic-release
-      - name: Upload a Build Artifact
-        uses: actions/upload-artifact@v4
-        with: 
-          name: Artifact
-          path: build/app/outputs/apk/release/revanced-manager*.apk

.releaserc

@@ -0,0 +1,64 @@
+{
+  "branches": [
+    "main",
+    {
+      "name": "dev",
+      "prerelease": true
+    }
+  ],
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer", {
+        "releaseRules": [
+          { "type": "build", "scope": "Needs bump", "release": "patch" }
+        ]
+      }
+    ],
+    "@semantic-release/changelog",
+    "@semantic-release/release-notes-generator",
+    [
+      "@droidsolutions-oss/semantic-release-update-file",
+      {
+        "files": [
+          {
+            "path": ["pubspec.yaml"],
+            "type": "flutter",
+            "branches": ["main", "dev"]
+          }
+        ]
+      }
+    ],
+    [
+      "@semantic-release/exec",
+      {
+        "prepareCmd": "flutter build apk"
+      }
+    ],
+    [
+      "@semantic-release/git",
+      {
+        "assets": [
+          "pubspec.yaml"
+        ]
+      }
+    ],
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "build/app/outputs/apk/release/revanced-manager*.apk"
+          }
+        ],
+        "successComment": false
+      }
+    ],
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        "backmergeBranches": [{"from": "main", "to": "dev"}],
+        "clearWorkspace": true
+      }
+    ]
+  ]
+}

android/app/build.gradle

@@ -23,7 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
-    compileSdk 34
+    compileSdk flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -113,7 +113,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10"
 
     // ReVanced
     implementation "app.revanced:revanced-patcher:19.1.0"

android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.9.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

android/settings.gradle

@@ -10,11 +10,16 @@ pluginManagement {
 
     includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-    plugins {
-        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    repositories {
+        google()
+        mavenCentral()
     }
 }
 
-include ":app"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.1.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.10" apply false
+}
 
-apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+include ":app"

assets/i18n/strings.i18n.json

@@ -166,6 +166,7 @@
     "debugSectionTitle": "Debugging",
     "advancedSectionTitle": "Advanced",
     "exportSectionTitle": "Import & export",
+    "dataSectionTitle": "Data sources",
     "themeModeLabel": "App theme",
     "systemThemeLabel": "System",
     "lightThemeLabel": "Light",
@@ -175,17 +176,18 @@
     "languageLabel": "Language",
     "languageUpdated": "Language updated",
     "englishOption": "English",
-    "sourcesLabel": "Sources",
-    "sourcesLabelHint": "Configure the source of patches and integrations",
+    "sourcesLabel": "Alternative sources",
+    "sourcesLabelHint": "Configure the alternative sources for ReVanced Patches and ReVanced Integrations",
     "sourcesIntegrationsLabel": "Integrations source",
+    "useAlternativeSources": "Use alternative sources",
+    "useAlternativeSourcesHint": "Use alternative sources for ReVanced Patches and ReVanced Integrations instead of the API",
     "sourcesResetDialogTitle": "Reset",
     "sourcesResetDialogText": "Are you sure you want to reset your sources to their default values?",
     "apiURLResetDialogText": "Are you sure you want to reset your API URL to its default value?",
-    "sourcesUpdateNote": "Note: Patches will be updated to the latest version automatically.\n\nThis will reveal your IP address to the server.",
+    "sourcesUpdateNote": "Note: This will automatically download ReVanced Patches and ReVanced Integrations from the alternative sources.\n\nThis will connect you to the alternative source.",
     "apiURLLabel": "API URL",
-    "apiURLHint": "Configure the URL of the API to use",
+    "apiURLHint": "Configure the API URL of ReVanced Manager",
     "selectApiURL": "API URL",
-    "hostRepositoryLabel": "Repository API",
     "orgPatchesLabel": "Patches organization",
     "sourcesPatchesLabel": "Patches source",
     "orgIntegrationsLabel": "Integrations organization",