From 97792002fd137d122878cdf6b74ff4a860f40e87 Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Wed, 1 Apr 2026 10:05:45 +0200
Subject: [PATCH 1/2] feat: Update ComposeLintPlugin and define baseline at the
 module level

---
 Core                 | 2 +-
 app/build.gradle.kts | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Core b/Core
index 2be567e5..aad23a13 160000
--- a/Core
+++ b/Core
@@ -1 +1 @@
-Subproject commit 2be567e5adae31ca5a69eab499ffbc89e04b30f8
+Subproject commit aad23a1361ae475ae8a94f0c5f87b0e3a74d7a99
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d808fb34..bd1ffe75 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -86,6 +86,10 @@ android {
     androidResources {
         generateLocaleConfig = true
     }
+
+    lint {
+        baseline = file("lint-baseline.xml")
+    }
 }
 
 val isRelease = gradle.startParameter.taskNames.any { it.contains("release", ignoreCase = true) }

From fe0f29c5bb4ab116e2bb4ead5aa29fdb598e2a89 Mon Sep 17 00:00:00 2001
From: Gibran Chevalley <gibran.chevalley@infomaniak.com>
Date: Wed, 1 Apr 2026 10:23:23 +0200
Subject: [PATCH 2/2] feat: Clean the lint-baseline file

---
 app/lint-baseline.xml | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 37dbe592..5f977542 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="6" by="lint 8.13.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.13.0)" variant="all" version="8.13.0">
 
-    <issue
-        id="ComposeViewModelInjection"
-        message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
-        errorLine1="    val appSettingsViewModel: AppSettingsViewModel = hiltViewModel&lt;AppSettingsViewModel>()"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/infomaniak/auth/ui/screen/settings/SettingsScreen.kt"
-            line="48"
-            column="5"/>
-    </issue>
-
     <issue
         id="ComposeViewModelInjection"
         message="Implicit dependencies of composables should be made explicit.&#xA;Usages of hiltViewModel to acquire a ViewModel should be done in composable default parameters, so that it is more testable and flexible.&#xA;See https://slackhq.github.io/compose-lints/rules/#viewmodels for more information."
@@ -30,21 +19,10 @@
         errorLine2="^">
         <location
             file="src/main/kotlin/com/infomaniak/auth/ui/components/StatusCard.kt"
-            line="120"
+            line="121"
             column="1"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [modifier: Modifier = Modifier, securityLevel: AccountSecurityLevel] but should be [securityLevel: AccountSecurityLevel, modifier: Modifier = Modifier].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="private fun SettingsSections(modifier: Modifier = Modifier, securityLevel: AccountSecurityLevel) {"
-        errorLine2="                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/com/infomaniak/auth/ui/screen/AccountDetails.kt"
-            line="234"
-            column="29"/>
-    </issue>
-
     <issue
         id="ComposeParameterOrder"
         message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [title: String, modifier: Modifier = Modifier, style: ButtonStyle = ButtonStyle.Primary, enabled: () -> Boolean = { true }, showIndeterminateProgress: () -> Boolean = { false }, progress: (() -> Float)? = null, onClick: () -> Unit, imageVector: ImageVector? = null] but should be [title: String, onClick: () -> Unit, modifier: Modifier = Modifier, style: ButtonStyle = ButtonStyle.Primary, enabled: () -> Boolean = { true }, showIndeterminateProgress: () -> Boolean = { false }, progress: (() -> Float)? = null, imageVector: ImageVector? = null].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
@@ -56,15 +34,4 @@
             column="16"/>
     </issue>
 
-    <issue
-        id="ComposeParameterOrder"
-        message="Parameters in a composable function should be ordered following this pattern: params without defaults, modifiers, params with defaults and optionally, a trailing function that might not have a default param.&#xA;Current params are: [modifier: Modifier = Modifier, sections: ImmutableList&lt;ImmutableList&lt;OptionItemType>>, content: @Composable (optionItem: List&lt;OptionItemType>) -> Unit] but should be [sections: ImmutableList&lt;ImmutableList&lt;OptionItemType>>, modifier: Modifier = Modifier, content: @Composable (optionItem: List&lt;OptionItemType>) -> Unit].&#xA;See https://slackhq.github.io/compose-lints/rules/#ordering-composable-parameters-properly for more information."
-        errorLine1="private fun OptionsSectionContainer("
-        errorLine2="                                   ^">
-        <location
-            file="src/main/kotlin/com/infomaniak/auth/ui/components/OptionsSection.kt"
-            line="76"
-            column="36"/>
-    </issue>
-
 </issues>