chore: Modernize project setup

Update dependencies, move to Gradle KTs and overall improve build and project files.

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

android/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane"

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")
-}

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)
+}
+

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.** { *; }

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>

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>

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
-}

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")
+}

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

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" }

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"

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")