From 6e8d91568eadbbff2ed2bec779b28770f8a63930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Font=C3=A1n?= <gabilessto@gmail.com>
Date: Sun, 11 Aug 2024 16:44:07 +0200
Subject: [PATCH 1/3] refactor: Versioning system moved to project-level
 build.gradle.kts file

This commit updates the versioning logic. The `toVersionCode` function is also added to the `Version`
 class to calculate the version code based on the version components.
 - Added Room schemas folder creation when it doesn't exist
 - Updated deprecated code for the `clean` Gradle task
---
 .idea/misc.xml         |  1 -
 app/build.gradle.kts   | 59 ++++----------------------------
 build.gradle.kts       | 76 ++++++++++++++++++++++++++++++++++++------
 color/build.gradle.kts |  1 -
 4 files changed, 71 insertions(+), 66 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cd79a1b2b7..b14a35d21c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 5de52bebc9..120ccb5716 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,57 +12,12 @@ plugins {
     alias(libs.plugins.compose.compiler)
 }
 
-sealed class Version(
-    open val versionMajor: Int,
-    val versionMinor: Int,
-    val versionPatch: Int,
-    val versionBuild: Int = 0
-) {
-    abstract fun toVersionName(): String
-    class Alpha(versionMajor: Int, versionMinor: Int, versionPatch: Int, versionBuild: Int) :
-        Version(versionMajor, versionMinor, versionPatch, versionBuild) {
-        override fun toVersionName(): String =
-            "${versionMajor}.${versionMinor}.${versionPatch}-alpha.$versionBuild"
-    }
-
-    class Beta(versionMajor: Int, versionMinor: Int, versionPatch: Int, versionBuild: Int) :
-        Version(versionMajor, versionMinor, versionPatch, versionBuild) {
-        override fun toVersionName(): String =
-            "${versionMajor}.${versionMinor}.${versionPatch}-beta.$versionBuild"
-    }
-
-    class Stable(versionMajor: Int, versionMinor: Int, versionPatch: Int) :
-        Version(versionMajor, versionMinor, versionPatch) {
-        override fun toVersionName(): String =
-            "${versionMajor}.${versionMinor}.${versionPatch}"
-    }
-
-    class ReleaseCandidate(
-        versionMajor: Int,
-        versionMinor: Int,
-        versionPatch: Int,
-        versionBuild: Int
-    ) :
-        Version(versionMajor, versionMinor, versionPatch, versionBuild) {
-        override fun toVersionName(): String =
-            "${versionMajor}.${versionMinor}.${versionPatch}-rc.$versionBuild"
-    }
-}
-
-val currentVersion: Version = Version.Alpha(
-    versionMajor = 2,
-    versionMinor = 0,
-    versionPatch = 0,
-    versionBuild = 2
-)
-
 val keystorePropertiesFile: File = rootProject.file("keystore.properties")
 
 val splitApks = !project.hasProperty("noSplits")
 
 val abiFilterList = (properties["ABI_FILTERS"] as String).split(';')
 
-
 android {
     if (keystorePropertiesFile.exists()) {
         val keystoreProperties = Properties()
@@ -80,13 +35,11 @@ android {
 
     compileSdk = 34
 
-
-
     defaultConfig {
         applicationId = "com.junkfood.seal"
         minSdk = 24
         targetSdk = 34
-        versionCode = 20000
+        versionCode = rootProject.extra["versionCode"] as Int
 
         if (splitApks) {
             splits {
@@ -99,7 +52,7 @@ android {
             }
         }
 
-        versionName = currentVersion.toVersionName().run {
+        versionName = (rootProject.extra["versionName"] as String).run {
             if (!splitApks) "$this-(F-Droid)"
             else this
         }
@@ -246,16 +199,16 @@ dependencies {
     androidTestImplementation(libs.androidx.test.ext)
     androidTestImplementation(libs.androidx.test.espresso.core)
     implementation(libs.androidx.compose.ui.tooling)
-
 }
 
 class RoomSchemaArgProvider(
-    @get:InputDirectory
-    @get:PathSensitive(PathSensitivity.RELATIVE)
-    val schemaDir: File
+    @get:InputDirectory @get:PathSensitive(PathSensitivity.RELATIVE) val schemaDir: File
 ) : CommandLineArgumentProvider {
 
     override fun asArguments(): Iterable<String> {
+        if (!schemaDir.exists()) {
+            schemaDir.mkdirs()
+        }
         return listOf("room.schemaLocation=${schemaDir.path}")
     }
 }
diff --git a/build.gradle.kts b/build.gradle.kts
index 766b475a97..69d665b17e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,24 +1,78 @@
-@file:Suppress("UnstableApiUsage")
+plugins {
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.ksp) apply false
+    alias(libs.plugins.compose.compiler) apply false
+}
 
 buildscript {
-
     repositories {
         mavenCentral()
         google()
     }
 }
 
-@Suppress("DSL_SCOPE_VIOLATION")
-plugins {
-    alias(libs.plugins.android.application) apply false
-    alias(libs.plugins.android.library) apply false
-    alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kotlin.serialization) apply false
-    alias(libs.plugins.ksp) apply false
-    alias(libs.plugins.compose.compiler) apply false
+sealed class Version(
+    open val versionMajor: Int,
+    val versionMinor: Int,
+    val versionPatch: Int,
+    val versionBuild: Int = 0
+) {
+    abstract fun toVersionName(): String
+
+    fun toVersionCode(): Int {
+        val minor = versionMinor.toString().padStart(2, '0')
+        val patch = versionPatch.toString().padStart(2, '0')
+
+        // Combining the version components, ensuring the result is 5 digits
+        // We suppose that the major version won't be greater than 9
+        return "$versionMajor$minor$patch".toInt()
+    }
+
+
+    class Alpha(versionMajor: Int, versionMinor: Int, versionPatch: Int, versionBuild: Int) :
+        Version(versionMajor, versionMinor, versionPatch, versionBuild) {
+        override fun toVersionName(): String =
+            "${versionMajor}.${versionMinor}.${versionPatch}-alpha.$versionBuild"
+    }
+
+    class Beta(versionMajor: Int, versionMinor: Int, versionPatch: Int, versionBuild: Int) :
+        Version(versionMajor, versionMinor, versionPatch, versionBuild) {
+        override fun toVersionName(): String =
+            "${versionMajor}.${versionMinor}.${versionPatch}-beta.$versionBuild"
+    }
+
+    class Stable(versionMajor: Int, versionMinor: Int, versionPatch: Int) :
+        Version(versionMajor, versionMinor, versionPatch) {
+        override fun toVersionName(): String =
+            "${versionMajor}.${versionMinor}.${versionPatch}"
+    }
+
+    class ReleaseCandidate(
+        versionMajor: Int,
+        versionMinor: Int,
+        versionPatch: Int,
+        versionBuild: Int
+    ) :
+        Version(versionMajor, versionMinor, versionPatch, versionBuild) {
+        override fun toVersionName(): String =
+            "${versionMajor}.${versionMinor}.${versionPatch}-rc.$versionBuild"
+    }
 }
 
+val currentVersion: Version = Version.Alpha(
+    versionMajor = 2,
+    versionMinor = 0,
+    versionPatch = 0,
+    versionBuild = 2
+)
+
+val versionCode by extra(currentVersion.toVersionCode())
+val versionName by extra(currentVersion.toVersionName())
+
 tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
 
diff --git a/color/build.gradle.kts b/color/build.gradle.kts
index 778b96ef32..f876ae26d2 100644
--- a/color/build.gradle.kts
+++ b/color/build.gradle.kts
@@ -37,5 +37,4 @@ dependencies {
     api(libs.androidx.core.ktx)
     api(libs.androidx.compose.foundation)
     api(libs.androidx.compose.material3)
-
 }
\ No newline at end of file

From 3ca2e1e97db72c424bc96f3e98caa7f030493c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Font=C3=A1n?= <gabilessto@gmail.com>
Date: Mon, 12 Aug 2024 16:52:05 +0200
Subject: [PATCH 2/3] chore/refactor: add Room dedicated plugin

This commit updates various changes, including:
- Moved hardcoded version to version declaration (version.ref) for the androidx-compose-material3  dependency
- Adding Room plugin to the project and configuring schema directory
- Removing custom RoomSchemaArgProvider and using the built-in Room schema functionality
- Updating versionCode to 20000 due to F-droid requirements
---
 app/build.gradle.kts      | 24 +++++++-----------------
 build.gradle.kts          |  1 +
 gradle/libs.versions.toml |  5 +++--
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 120ccb5716..fa473dd481 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.ksp)
     alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.room)
 }
 
 val keystorePropertiesFile: File = rootProject.file("keystore.properties")
@@ -39,7 +40,7 @@ android {
         applicationId = "com.junkfood.seal"
         minSdk = 24
         targetSdk = 34
-        versionCode = rootProject.extra["versionCode"] as Int
+        versionCode = 20000 // (rootProject.extra["versionCode"] as Int) -- Can't be used because of F-droid
 
         if (splitApks) {
             splits {
@@ -60,16 +61,17 @@ android {
         vectorDrawables {
             useSupportLibrary = true
         }
-        ksp {
-            arg(RoomSchemaArgProvider(File(projectDir, "schemas")))
-            arg("room.incremental", "true")
-        }
+
         if (!splitApks) {
             ndk {
                 abiFilters.addAll(abiFilterList)
             }
         }
     }
+    room {
+        schemaDirectory("$projectDir/schemas")
+    }
+
     val abiCodes = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4)
 
     androidComponents {
@@ -200,15 +202,3 @@ dependencies {
     androidTestImplementation(libs.androidx.test.espresso.core)
     implementation(libs.androidx.compose.ui.tooling)
 }
-
-class RoomSchemaArgProvider(
-    @get:InputDirectory @get:PathSensitive(PathSensitivity.RELATIVE) val schemaDir: File
-) : CommandLineArgumentProvider {
-
-    override fun asArguments(): Iterable<String> {
-        if (!schemaDir.exists()) {
-            schemaDir.mkdirs()
-        }
-        return listOf("room.schemaLocation=${schemaDir.path}")
-    }
-}
diff --git a/build.gradle.kts b/build.gradle.kts
index 69d665b17e..cd06abdf0f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.room) apply false
 }
 
 buildscript {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e1ac4d3e89..21a5210df3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@ androidxSplashscreen = "1.0.1"
 androidxLifecycle = "2.8.4"
 androidxNavigation = "2.7.7"
 androidxFoundation = "1.6.0-beta03"
-androidxComposeMaterial3 = "1.2.0-beta01"
+androidxComposeMaterial3 = "1.3.0-alpha06"
 androidxComposeAnimation = "1.5.0-beta01"
 
 androidxEspresso = "3.5.0"
@@ -62,7 +62,7 @@ androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
 
 androidx-compose-material = { group = "androidx.compose.material", name = "material" }
 
-androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version = "1.3.0-alpha06" }
+androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidxComposeMaterial3" }
 androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
 
 okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
@@ -110,6 +110,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+room = { id = "androidx.room", version.ref = "room" }
 
 [bundles]
 accompanist = [

From 8c0764d6287f50c7cf5ce5e3404aaee7db1b235e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Font=C3=A1n?= <gabilessto@gmail.com>
Date: Mon, 12 Aug 2024 16:56:20 +0200
Subject: [PATCH 3/3] feat(build): enable incremental schema for room using ksp

This commit enables incremental annotation processing for Room using ksp.
 - Added `room.incremental`
 argument to ksp configuration.
 - Note that this is not yet supported by the Room plugin.
---
 app/build.gradle.kts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index fa473dd481..7c6f176005 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -71,7 +71,9 @@ android {
     room {
         schemaDirectory("$projectDir/schemas")
     }
-
+    ksp {
+        arg("room.incremental", "true") //Still not supported by the Room plugin
+    }
     val abiCodes = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4)
 
     androidComponents {