Merge pull request #2812 from HrBDev/gradle-kts

Migrate to Gradle Kotlin DSL

Author: hussainmohd-a

app/build.gradle

@@ -1348,7 +1348,7 @@ abstract class AppDatabase : RoomDatabase() {
                 }
             }
 
-        val MIGRATION_30_31: Migration =
+        internal val MIGRATION_30_31: Migration =
             object : Migration(30, 31) {
                 override fun migrate(db: SupportSQLiteDatabase) {
                     if (!doesColumnExistInTable(db, "AppInfo", "notes")) {

app/build.gradle.kts

@@ -4,7 +4,7 @@
 
   This file mirrors `app/src/full/AndroidManifest.xml` because the `tv`
   flavor inherits the entire `app/src/full/java` source set (see
-  `sourceSets.tv` in `app/build.gradle`). Every activity / receiver /
+  `sourceSets.tv` in `app/build.gradle.kts`). Every activity / receiver /
   service that upstream's Kotlin code references must be declared, or
   startActivity / PackageManager calls from the inherited classes will
   crash at runtime with ActivityNotFoundException / NameNotFoundException.

app/src/main/java/com/celzero/bravedns/database/AppDatabase.kt

@@ -0,0 +1,33 @@
+plugins {
+    id("com.android.test")
+}
+
+android {
+    namespace = "com.celzero.bravedns.benchmark"
+    compileSdk = 37
+
+    defaultConfig {
+        minSdk = 23
+        targetSdk = 37
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        // This benchmark build type is used for keyboard benchmarks
+        create("benchmark") {
+            isDebuggable = false
+            signingConfig = signingConfigs.getByName("debug")
+            matchingFallbacks += listOf("release")
+        }
+    }
+
+    targetProjectPath = ":app"
+    experimentalProperties["android.experimental.self-instrumenting"] = true
+}
+
+dependencies {
+    implementation("androidx.benchmark:benchmark-macro-junit4:1.3.3")
+    implementation("androidx.test.ext:junit:1.3.0")
+    implementation("androidx.test.uiautomator:uiautomator:2.3.0")
+}

app/src/tv/AndroidManifest.xml

@@ -0,0 +1,73 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    val kotlinVersion = "2.3.21"
+    repositories {
+        google()
+        // https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/
+        // jcenter() is no longer getting updates, instead using mavenCentral
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:9.4.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+        // Required by the TV flavor's Compose UI.
+        classpath("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion")
+        
+        // add firebase plugins - will be conditionally applied in app/build.gradle
+        val taskNames = gradle.startParameter.taskNames.joinToString(",").lowercase()
+        val apkBuild = taskNames.contains("full")
+        val fdroidBuild = taskNames.contains("fdroid")
+
+        // check for fdroidserver value is set in system env
+        val fdroidBuildServer = System.getenv("fdroidserver")
+        val isFdroidBuildServer = !fdroidBuildServer.isNullOrEmpty() && fdroidBuildServer != "null"
+        val deGoogled = !apkBuild || fdroidBuild || isFdroidBuildServer
+
+        println("app-task names: '$taskNames'")
+        println("app; deGoogled? $deGoogled (fdroidBuild: $fdroidBuild, fdroidBuildServer: $isFdroidBuildServer, apkBuild: $apkBuild)")
+
+        if (!deGoogled) {
+            classpath("com.google.gms:google-services:4.4.4")
+            classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.7")
+        }
+    }
+}
+
+plugins {
+    id("com.google.devtools.ksp") version "2.3.9" apply false
+}
+
+allprojects {
+    repositories {
+        val firestackRepo = project.findProperty("firestackRepo")?.toString() ?: "github"
+
+        when (firestackRepo) {
+            "jitpack" -> {
+                // jitpack.io/#celzero/firestack
+                maven { url = uri("https://jitpack.io") }
+            }
+            "github" -> {
+                // maven.pkg.github.com/celzero/firestack
+                maven {
+                    name = "GitHubPackages"
+                    url = uri("https://maven.pkg.github.com/celzero/firestack")
+                    credentials {
+                        username =
+                            project.findProperty("gpr.user")?.toString() ?: System.getenv("USERNAME_GITHUB")
+                        password =
+                            project.findProperty("gpr.key")?.toString() ?: System.getenv("TOKEN_GITHUB")
+                    }
+                }
+            }
+            else -> {
+                // ossrh: https://central.sonatype.com/artifact/com.celzero/firestack/
+                // no-op; mavenCentral is already included
+            }
+        }
+    }
+}
+
+tasks.register<Delete>("clean") {
+    delete(layout.buildDirectory)
+}

benchmark/build.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

benchmark/build.gradle.kts

@@ -1,6 +1,6 @@
-rootProject.name='rethink'
-include ':app'
-include ':benchmark'
+rootProject.name = "rethink"
+include(":app")
+include(":benchmark")
 
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
@@ -13,15 +13,15 @@ dependencyResolutionManagement {
         // from the repository selected via `firestackRepo` in gradle.properties.
         // NOTE: with RepositoriesMode.PREFER_SETTINGS, repositories declared in
         // project build.gradle files are ignored
-        def firestackRepo = providers.gradleProperty("firestackRepo").orElse("github").get()
+        val firestackRepo = providers.gradleProperty("firestackRepo").orElse("github").get()
 
         if (firestackRepo == "jitpack") {
             // jitpack.io/#celzero/firestack
-            maven { url 'https://jitpack.io' }
+            maven { url = uri("https://jitpack.io") }
         } else if (firestackRepo == "github") {
             // maven.pkg.github.com/celzero/firestack
             maven {
-                name = 'GitHubPackages'
+                name = "GitHubPackages"
                 url = uri("https://maven.pkg.github.com/celzero/firestack")
                 credentials {
                     username = providers.gradleProperty("gpr.user").orElse(providers.environmentVariable("USERNAME_GITHUB")).getOrNull()