From cf80550f01a7fb2f3bfe859bd0e9b5e370d535d0 Mon Sep 17 00:00:00 2001 From: Vincent TE Date: Thu, 21 Aug 2025 11:00:32 +0200 Subject: [PATCH 1/5] chore: Add different baseline files # Conflicts: # build.gradle.kts --- AppIntegrity/config/ktlint/baseline.xml | 39 ++++ Auth/config/ktlint/baseline.xml | 56 +++++ Avatar/config/ktlint/baseline.xml | 22 ++ Coil/config/ktlint/baseline.xml | 12 + .../BasicButton/config/ktlint/baseline.xml | 9 + Compose/Basics/config/ktlint/baseline.xml | 33 +++ Compose/Margin/config/ktlint/baseline.xml | 3 + .../config/ktlint/baseline.xml | 7 + Compose/config/ktlint/baseline.xml | 3 + CrossAppLogin/Back/config/ktlint/baseline.xml | 76 +++++++ .../Front/config/ktlint/baseline.xml | 94 ++++++++ CrossAppLogin/config/ktlint/baseline.xml | 6 + FragmentNavigation/config/ktlint/baseline.xml | 6 + Legacy/AppLock/config/ktlint/baseline.xml | 16 ++ Legacy/BugTracker/config/ktlint/baseline.xml | 27 +++ Legacy/Confetti/config/ktlint/baseline.xml | 19 ++ Legacy/Stores/config/ktlint/baseline.xml | 57 +++++ Legacy/config/ktlint/baseline.xml | 206 ++++++++++++++++++ Matomo/config/ktlint/baseline.xml | 8 + Network/Models/config/ktlint/baseline.xml | 17 ++ Network/config/ktlint/baseline.xml | 46 ++++ Onboarding/config/ktlint/baseline.xml | 12 + Sentry/config/ktlint/baseline.xml | 30 +++ config/ktlint/baseline.xml | 125 +++++++++++ kSuite/MykSuite/config/ktlint/baseline.xml | 140 ++++++++++++ kSuite/config/ktlint/baseline.xml | 6 + kSuite/kSuitePro/config/ktlint/baseline.xml | 6 + 27 files changed, 1081 insertions(+) create mode 100644 AppIntegrity/config/ktlint/baseline.xml create mode 100644 Auth/config/ktlint/baseline.xml create mode 100644 Avatar/config/ktlint/baseline.xml create mode 100644 Coil/config/ktlint/baseline.xml create mode 100644 Compose/BasicButton/config/ktlint/baseline.xml create mode 100644 Compose/Basics/config/ktlint/baseline.xml create mode 100644 Compose/Margin/config/ktlint/baseline.xml create mode 100644 Compose/MaterialThemeFromXml/config/ktlint/baseline.xml create mode 100644 Compose/config/ktlint/baseline.xml create mode 100644 CrossAppLogin/Back/config/ktlint/baseline.xml create mode 100644 CrossAppLogin/Front/config/ktlint/baseline.xml create mode 100644 CrossAppLogin/config/ktlint/baseline.xml create mode 100644 FragmentNavigation/config/ktlint/baseline.xml create mode 100644 Legacy/AppLock/config/ktlint/baseline.xml create mode 100644 Legacy/BugTracker/config/ktlint/baseline.xml create mode 100644 Legacy/Confetti/config/ktlint/baseline.xml create mode 100644 Legacy/Stores/config/ktlint/baseline.xml create mode 100644 Legacy/config/ktlint/baseline.xml create mode 100644 Matomo/config/ktlint/baseline.xml create mode 100644 Network/Models/config/ktlint/baseline.xml create mode 100644 Network/config/ktlint/baseline.xml create mode 100644 Onboarding/config/ktlint/baseline.xml create mode 100644 Sentry/config/ktlint/baseline.xml create mode 100644 config/ktlint/baseline.xml create mode 100644 kSuite/MykSuite/config/ktlint/baseline.xml create mode 100644 kSuite/config/ktlint/baseline.xml create mode 100644 kSuite/kSuitePro/config/ktlint/baseline.xml diff --git a/AppIntegrity/config/ktlint/baseline.xml b/AppIntegrity/config/ktlint/baseline.xml new file mode 100644 index 000000000..c40165186 --- /dev/null +++ b/AppIntegrity/config/ktlint/baseline.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Auth/config/ktlint/baseline.xml b/Auth/config/ktlint/baseline.xml new file mode 100644 index 000000000..cec0780fb --- /dev/null +++ b/Auth/config/ktlint/baseline.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Avatar/config/ktlint/baseline.xml b/Avatar/config/ktlint/baseline.xml new file mode 100644 index 000000000..8c3442470 --- /dev/null +++ b/Avatar/config/ktlint/baseline.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Coil/config/ktlint/baseline.xml b/Coil/config/ktlint/baseline.xml new file mode 100644 index 000000000..c6b4ac8dc --- /dev/null +++ b/Coil/config/ktlint/baseline.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Compose/BasicButton/config/ktlint/baseline.xml b/Compose/BasicButton/config/ktlint/baseline.xml new file mode 100644 index 000000000..f2abebeeb --- /dev/null +++ b/Compose/BasicButton/config/ktlint/baseline.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Compose/Basics/config/ktlint/baseline.xml b/Compose/Basics/config/ktlint/baseline.xml new file mode 100644 index 000000000..f69443efe --- /dev/null +++ b/Compose/Basics/config/ktlint/baseline.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Compose/Margin/config/ktlint/baseline.xml b/Compose/Margin/config/ktlint/baseline.xml new file mode 100644 index 000000000..981420778 --- /dev/null +++ b/Compose/Margin/config/ktlint/baseline.xml @@ -0,0 +1,3 @@ + + + diff --git a/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml b/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml new file mode 100644 index 000000000..4970e2b6f --- /dev/null +++ b/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Compose/config/ktlint/baseline.xml b/Compose/config/ktlint/baseline.xml new file mode 100644 index 000000000..981420778 --- /dev/null +++ b/Compose/config/ktlint/baseline.xml @@ -0,0 +1,3 @@ + + + diff --git a/CrossAppLogin/Back/config/ktlint/baseline.xml b/CrossAppLogin/Back/config/ktlint/baseline.xml new file mode 100644 index 000000000..9cee86f47 --- /dev/null +++ b/CrossAppLogin/Back/config/ktlint/baseline.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CrossAppLogin/Front/config/ktlint/baseline.xml b/CrossAppLogin/Front/config/ktlint/baseline.xml new file mode 100644 index 000000000..aee677d3e --- /dev/null +++ b/CrossAppLogin/Front/config/ktlint/baseline.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CrossAppLogin/config/ktlint/baseline.xml b/CrossAppLogin/config/ktlint/baseline.xml new file mode 100644 index 000000000..dab605f89 --- /dev/null +++ b/CrossAppLogin/config/ktlint/baseline.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/FragmentNavigation/config/ktlint/baseline.xml b/FragmentNavigation/config/ktlint/baseline.xml new file mode 100644 index 000000000..a7525f4e5 --- /dev/null +++ b/FragmentNavigation/config/ktlint/baseline.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Legacy/AppLock/config/ktlint/baseline.xml b/Legacy/AppLock/config/ktlint/baseline.xml new file mode 100644 index 000000000..402c3bf26 --- /dev/null +++ b/Legacy/AppLock/config/ktlint/baseline.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Legacy/BugTracker/config/ktlint/baseline.xml b/Legacy/BugTracker/config/ktlint/baseline.xml new file mode 100644 index 000000000..0559a5235 --- /dev/null +++ b/Legacy/BugTracker/config/ktlint/baseline.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Legacy/Confetti/config/ktlint/baseline.xml b/Legacy/Confetti/config/ktlint/baseline.xml new file mode 100644 index 000000000..5b37616d8 --- /dev/null +++ b/Legacy/Confetti/config/ktlint/baseline.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Legacy/Stores/config/ktlint/baseline.xml b/Legacy/Stores/config/ktlint/baseline.xml new file mode 100644 index 000000000..2ef5ab3b9 --- /dev/null +++ b/Legacy/Stores/config/ktlint/baseline.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Legacy/config/ktlint/baseline.xml b/Legacy/config/ktlint/baseline.xml new file mode 100644 index 000000000..309f82dec --- /dev/null +++ b/Legacy/config/ktlint/baseline.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Matomo/config/ktlint/baseline.xml b/Matomo/config/ktlint/baseline.xml new file mode 100644 index 000000000..f20b26a94 --- /dev/null +++ b/Matomo/config/ktlint/baseline.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Network/Models/config/ktlint/baseline.xml b/Network/Models/config/ktlint/baseline.xml new file mode 100644 index 000000000..10add2884 --- /dev/null +++ b/Network/Models/config/ktlint/baseline.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/Network/config/ktlint/baseline.xml b/Network/config/ktlint/baseline.xml new file mode 100644 index 000000000..a34dc3a75 --- /dev/null +++ b/Network/config/ktlint/baseline.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Onboarding/config/ktlint/baseline.xml b/Onboarding/config/ktlint/baseline.xml new file mode 100644 index 000000000..d55ae2f01 --- /dev/null +++ b/Onboarding/config/ktlint/baseline.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Sentry/config/ktlint/baseline.xml b/Sentry/config/ktlint/baseline.xml new file mode 100644 index 000000000..439ef67f6 --- /dev/null +++ b/Sentry/config/ktlint/baseline.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/ktlint/baseline.xml b/config/ktlint/baseline.xml new file mode 100644 index 000000000..57ca7e1f2 --- /dev/null +++ b/config/ktlint/baseline.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kSuite/MykSuite/config/ktlint/baseline.xml b/kSuite/MykSuite/config/ktlint/baseline.xml new file mode 100644 index 000000000..fd2df0049 --- /dev/null +++ b/kSuite/MykSuite/config/ktlint/baseline.xml @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/kSuite/config/ktlint/baseline.xml b/kSuite/config/ktlint/baseline.xml new file mode 100644 index 000000000..dab605f89 --- /dev/null +++ b/kSuite/config/ktlint/baseline.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/kSuite/kSuitePro/config/ktlint/baseline.xml b/kSuite/kSuitePro/config/ktlint/baseline.xml new file mode 100644 index 000000000..dab605f89 --- /dev/null +++ b/kSuite/kSuitePro/config/ktlint/baseline.xml @@ -0,0 +1,6 @@ + + + + + + From 65026169eaed71bc1fabb3966044de13df95789d Mon Sep 17 00:00:00 2001 From: Vincent TE Date: Thu, 21 Aug 2025 13:08:40 +0200 Subject: [PATCH 2/5] chore: Update baseline files --- Ktor/config/ktlint/baseline.xml | 12 ++++++++++++ RecyclerView/config/ktlint/baseline.xml | 16 ++++++++++++++++ Thumbnails/config/ktlint/baseline.xml | 8 ++++++++ 3 files changed, 36 insertions(+) create mode 100644 Ktor/config/ktlint/baseline.xml create mode 100644 RecyclerView/config/ktlint/baseline.xml create mode 100644 Thumbnails/config/ktlint/baseline.xml diff --git a/Ktor/config/ktlint/baseline.xml b/Ktor/config/ktlint/baseline.xml new file mode 100644 index 000000000..5ae98a482 --- /dev/null +++ b/Ktor/config/ktlint/baseline.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/RecyclerView/config/ktlint/baseline.xml b/RecyclerView/config/ktlint/baseline.xml new file mode 100644 index 000000000..31e37098d --- /dev/null +++ b/RecyclerView/config/ktlint/baseline.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Thumbnails/config/ktlint/baseline.xml b/Thumbnails/config/ktlint/baseline.xml new file mode 100644 index 000000000..a7a2218be --- /dev/null +++ b/Thumbnails/config/ktlint/baseline.xml @@ -0,0 +1,8 @@ + + + + + + + + From 6267d6cd4e66ca8e7db90d2bf82dcd3ba4791b71 Mon Sep 17 00:00:00 2001 From: Vincent Te Date: Wed, 8 Jul 2026 17:40:26 +0200 Subject: [PATCH 3/5] chore: Update baselines --- Legacy/config/ktlint/baseline.xml | 195 ++++++------------------------ config/ktlint/baseline.xml | 122 ------------------- 2 files changed, 39 insertions(+), 278 deletions(-) diff --git a/Legacy/config/ktlint/baseline.xml b/Legacy/config/ktlint/baseline.xml index 309f82dec..c67c9713c 100644 --- a/Legacy/config/ktlint/baseline.xml +++ b/Legacy/config/ktlint/baseline.xml @@ -1,202 +1,85 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - + - + - - - - + - - - - + - + - + - + diff --git a/config/ktlint/baseline.xml b/config/ktlint/baseline.xml index 57ca7e1f2..981420778 100644 --- a/config/ktlint/baseline.xml +++ b/config/ktlint/baseline.xml @@ -1,125 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 5a5d5ad24dc1c4ddddc275042b19515159aa27b3 Mon Sep 17 00:00:00 2001 From: Vincent Te Date: Thu, 9 Jul 2026 10:33:35 +0200 Subject: [PATCH 4/5] chore: Update baseline files --- AppIntegrity/config/ktlint/baseline.xml | 22 ++- AppLock/config/ktlint/baseline.xml | 28 ++++ AppVersionChecker/config/ktlint/baseline.xml | 27 +++ Auth/config/ktlint/baseline.xml | 78 ++++++--- Avatar/config/ktlint/baseline.xml | 18 +- BugTracker/config/ktlint/baseline.xml | 38 +++++ Coil/config/ktlint/baseline.xml | 13 +- Common/config/ktlint/baseline.xml | 154 ++++++++++++++++++ .../BasicButton/config/ktlint/baseline.xml | 9 - Compose/Basics/config/ktlint/baseline.xml | 33 ---- .../config/ktlint/baseline.xml | 7 - CrossAppLogin/Back/config/ktlint/baseline.xml | 62 ++++--- .../Front/config/ktlint/baseline.xml | 90 +++++----- DataValue/config/ktlint/baseline.xml | 6 + DotLottie/config/ktlint/baseline.xml | 11 ++ File/config/ktlint/baseline.xml | 21 +++ FileTypes/config/ktlint/baseline.xml | 82 ++++++++++ FragmentNavigation/config/ktlint/baseline.xml | 3 +- InAppReview/config/ktlint/baseline.xml | 6 + InAppUpdate/config/ktlint/baseline.xml | 57 +++++++ Legacy/AppLock/config/ktlint/baseline.xml | 16 -- Legacy/BugTracker/config/ktlint/baseline.xml | 27 --- Legacy/Confetti/config/ktlint/baseline.xml | 19 --- Legacy/Stores/config/ktlint/baseline.xml | 57 ------- Legacy/config/ktlint/baseline.xml | 89 ---------- Login/config/ktlint/baseline.xml | 56 +++++++ Matomo/config/ktlint/baseline.xml | 6 +- Network/Ktor/config/ktlint/baseline.xml | 6 + Network/config/ktlint/baseline.xml | 20 ++- .../Registration/config/ktlint/baseline.xml | 15 ++ Notifications/config/ktlint/baseline.xml | 8 + Onboarding/config/ktlint/baseline.xml | 28 +++- PermissionManager/config/ktlint/baseline.xml | 7 + PrivacyManagement/config/ktlint/baseline.xml | 68 ++++++++ Sentry/config/ktlint/baseline.xml | 35 ++-- SharedValues/config/ktlint/baseline.xml | 8 + .../WithUserDb}/config/ktlint/baseline.xml | 0 TwoFactorAuth/Back/config/ktlint/baseline.xml | 42 +++++ .../Front/config/ktlint/baseline.xml | 79 +++++++++ .../config/ktlint/baseline.xml | 13 ++ .../BasicButton/config/ktlint/baseline.xml | 12 ++ Ui/Compose/Basics/config/ktlint/baseline.xml | 38 +++++ .../config/ktlint/baseline.xml | 24 +++ .../Margin}/config/ktlint/baseline.xml | 0 .../config/ktlint/baseline.xml | 7 + Ui/Compose/Preview/config/ktlint/baseline.xml | 3 + Ui/Compose/Theme/config/ktlint/baseline.xml | 6 + Ui/View/EdgeToEdge/config/ktlint/baseline.xml | 10 ++ Ui/View/config/ktlint/baseline.xml | 9 + Ui/config/ktlint/baseline.xml | 3 + WebView/config/ktlint/baseline.xml | 17 ++ kSuite/MykSuite/config/ktlint/baseline.xml | 35 ++-- kSuite/config/ktlint/baseline.xml | 3 - kSuite/kSuitePro/config/ktlint/baseline.xml | 36 +++- 54 files changed, 1162 insertions(+), 405 deletions(-) create mode 100644 AppLock/config/ktlint/baseline.xml create mode 100644 AppVersionChecker/config/ktlint/baseline.xml create mode 100644 BugTracker/config/ktlint/baseline.xml create mode 100644 Common/config/ktlint/baseline.xml delete mode 100644 Compose/BasicButton/config/ktlint/baseline.xml delete mode 100644 Compose/Basics/config/ktlint/baseline.xml delete mode 100644 Compose/MaterialThemeFromXml/config/ktlint/baseline.xml create mode 100644 DataValue/config/ktlint/baseline.xml create mode 100644 DotLottie/config/ktlint/baseline.xml create mode 100644 File/config/ktlint/baseline.xml create mode 100644 FileTypes/config/ktlint/baseline.xml create mode 100644 InAppReview/config/ktlint/baseline.xml create mode 100644 InAppUpdate/config/ktlint/baseline.xml delete mode 100644 Legacy/AppLock/config/ktlint/baseline.xml delete mode 100644 Legacy/BugTracker/config/ktlint/baseline.xml delete mode 100644 Legacy/Confetti/config/ktlint/baseline.xml delete mode 100644 Legacy/Stores/config/ktlint/baseline.xml delete mode 100644 Legacy/config/ktlint/baseline.xml create mode 100644 Login/config/ktlint/baseline.xml create mode 100644 Network/Ktor/config/ktlint/baseline.xml create mode 100644 Notifications/Registration/config/ktlint/baseline.xml create mode 100644 Notifications/config/ktlint/baseline.xml create mode 100644 PermissionManager/config/ktlint/baseline.xml create mode 100644 PrivacyManagement/config/ktlint/baseline.xml create mode 100644 SharedValues/config/ktlint/baseline.xml rename {Compose/Margin => TwoFactorAuth/Back/WithUserDb}/config/ktlint/baseline.xml (100%) create mode 100644 TwoFactorAuth/Back/config/ktlint/baseline.xml create mode 100644 TwoFactorAuth/Front/config/ktlint/baseline.xml create mode 100644 Ui/Compose/AccountBottomSheet/config/ktlint/baseline.xml create mode 100644 Ui/Compose/BasicButton/config/ktlint/baseline.xml create mode 100644 Ui/Compose/Basics/config/ktlint/baseline.xml create mode 100644 Ui/Compose/BottomStickyButtonScaffolds/config/ktlint/baseline.xml rename {Compose => Ui/Compose/Margin}/config/ktlint/baseline.xml (100%) create mode 100644 Ui/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml create mode 100644 Ui/Compose/Preview/config/ktlint/baseline.xml create mode 100644 Ui/Compose/Theme/config/ktlint/baseline.xml create mode 100644 Ui/View/EdgeToEdge/config/ktlint/baseline.xml create mode 100644 Ui/View/config/ktlint/baseline.xml create mode 100644 Ui/config/ktlint/baseline.xml create mode 100644 WebView/config/ktlint/baseline.xml diff --git a/AppIntegrity/config/ktlint/baseline.xml b/AppIntegrity/config/ktlint/baseline.xml index c40165186..43e1502f8 100644 --- a/AppIntegrity/config/ktlint/baseline.xml +++ b/AppIntegrity/config/ktlint/baseline.xml @@ -2,17 +2,26 @@ + + - - - + + + + + + + + + + @@ -21,6 +30,9 @@ + + + @@ -29,6 +41,10 @@ + + + + diff --git a/AppLock/config/ktlint/baseline.xml b/AppLock/config/ktlint/baseline.xml new file mode 100644 index 000000000..3ed41f4ad --- /dev/null +++ b/AppLock/config/ktlint/baseline.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AppVersionChecker/config/ktlint/baseline.xml b/AppVersionChecker/config/ktlint/baseline.xml new file mode 100644 index 000000000..f3e09947a --- /dev/null +++ b/AppVersionChecker/config/ktlint/baseline.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Auth/config/ktlint/baseline.xml b/Auth/config/ktlint/baseline.xml index cec0780fb..4ae1bed3a 100644 --- a/Auth/config/ktlint/baseline.xml +++ b/Auth/config/ktlint/baseline.xml @@ -1,56 +1,80 @@ - - - - + + - - + + + + + - + + + + + + + + + + + + - - - + + + - - - + + + + + + + - + - + + + + - + + + + + - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Avatar/config/ktlint/baseline.xml b/Avatar/config/ktlint/baseline.xml index 8c3442470..f2f28bf9d 100644 --- a/Avatar/config/ktlint/baseline.xml +++ b/Avatar/config/ktlint/baseline.xml @@ -1,22 +1,26 @@ + + + - - + + - - + + + - - + + - + diff --git a/BugTracker/config/ktlint/baseline.xml b/BugTracker/config/ktlint/baseline.xml new file mode 100644 index 000000000..8d86bcab6 --- /dev/null +++ b/BugTracker/config/ktlint/baseline.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Coil/config/ktlint/baseline.xml b/Coil/config/ktlint/baseline.xml index c6b4ac8dc..cb8a9c553 100644 --- a/Coil/config/ktlint/baseline.xml +++ b/Coil/config/ktlint/baseline.xml @@ -1,8 +1,15 @@ - - - + + + + + + + + + + diff --git a/Common/config/ktlint/baseline.xml b/Common/config/ktlint/baseline.xml new file mode 100644 index 000000000..ae9f5ecf0 --- /dev/null +++ b/Common/config/ktlint/baseline.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Compose/BasicButton/config/ktlint/baseline.xml b/Compose/BasicButton/config/ktlint/baseline.xml deleted file mode 100644 index f2abebeeb..000000000 --- a/Compose/BasicButton/config/ktlint/baseline.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/Compose/Basics/config/ktlint/baseline.xml b/Compose/Basics/config/ktlint/baseline.xml deleted file mode 100644 index f69443efe..000000000 --- a/Compose/Basics/config/ktlint/baseline.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml b/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml deleted file mode 100644 index 4970e2b6f..000000000 --- a/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/CrossAppLogin/Back/config/ktlint/baseline.xml b/CrossAppLogin/Back/config/ktlint/baseline.xml index 9cee86f47..16676be2f 100644 --- a/CrossAppLogin/Back/config/ktlint/baseline.xml +++ b/CrossAppLogin/Back/config/ktlint/baseline.xml @@ -1,22 +1,40 @@ - + + + + + + + + + + + + + - + + + + + + + - - - + + + @@ -35,14 +53,14 @@ - - - + + + - - - + + + @@ -52,8 +70,7 @@ - - + @@ -63,14 +80,19 @@ - - - - + + + + + - - - + + + + + + + diff --git a/CrossAppLogin/Front/config/ktlint/baseline.xml b/CrossAppLogin/Front/config/ktlint/baseline.xml index aee677d3e..d8b2aa9a3 100644 --- a/CrossAppLogin/Front/config/ktlint/baseline.xml +++ b/CrossAppLogin/Front/config/ktlint/baseline.xml @@ -1,38 +1,55 @@ - - + + + - - + + + - + + + + + + + + + + + + - - + + + - - + + + - - + + - - + + + - - + + + @@ -40,19 +57,24 @@ - - - - - - - + + + + + + + + + + + + @@ -63,32 +85,20 @@ - - + + - - - - - - - - - - - - - + + - - - + + diff --git a/DataValue/config/ktlint/baseline.xml b/DataValue/config/ktlint/baseline.xml new file mode 100644 index 000000000..f6e10902d --- /dev/null +++ b/DataValue/config/ktlint/baseline.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/DotLottie/config/ktlint/baseline.xml b/DotLottie/config/ktlint/baseline.xml new file mode 100644 index 000000000..f9c64e2a5 --- /dev/null +++ b/DotLottie/config/ktlint/baseline.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/File/config/ktlint/baseline.xml b/File/config/ktlint/baseline.xml new file mode 100644 index 000000000..c04b416a0 --- /dev/null +++ b/File/config/ktlint/baseline.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/FileTypes/config/ktlint/baseline.xml b/FileTypes/config/ktlint/baseline.xml new file mode 100644 index 000000000..f4b04384b --- /dev/null +++ b/FileTypes/config/ktlint/baseline.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FragmentNavigation/config/ktlint/baseline.xml b/FragmentNavigation/config/ktlint/baseline.xml index a7525f4e5..5ad64fc9c 100644 --- a/FragmentNavigation/config/ktlint/baseline.xml +++ b/FragmentNavigation/config/ktlint/baseline.xml @@ -1,6 +1,7 @@ - + + diff --git a/InAppReview/config/ktlint/baseline.xml b/InAppReview/config/ktlint/baseline.xml new file mode 100644 index 000000000..b50618e01 --- /dev/null +++ b/InAppReview/config/ktlint/baseline.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/InAppUpdate/config/ktlint/baseline.xml b/InAppUpdate/config/ktlint/baseline.xml new file mode 100644 index 000000000..fda1ff54f --- /dev/null +++ b/InAppUpdate/config/ktlint/baseline.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Legacy/AppLock/config/ktlint/baseline.xml b/Legacy/AppLock/config/ktlint/baseline.xml deleted file mode 100644 index 402c3bf26..000000000 --- a/Legacy/AppLock/config/ktlint/baseline.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Legacy/BugTracker/config/ktlint/baseline.xml b/Legacy/BugTracker/config/ktlint/baseline.xml deleted file mode 100644 index 0559a5235..000000000 --- a/Legacy/BugTracker/config/ktlint/baseline.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Legacy/Confetti/config/ktlint/baseline.xml b/Legacy/Confetti/config/ktlint/baseline.xml deleted file mode 100644 index 5b37616d8..000000000 --- a/Legacy/Confetti/config/ktlint/baseline.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Legacy/Stores/config/ktlint/baseline.xml b/Legacy/Stores/config/ktlint/baseline.xml deleted file mode 100644 index 2ef5ab3b9..000000000 --- a/Legacy/Stores/config/ktlint/baseline.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Legacy/config/ktlint/baseline.xml b/Legacy/config/ktlint/baseline.xml deleted file mode 100644 index c67c9713c..000000000 --- a/Legacy/config/ktlint/baseline.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Login/config/ktlint/baseline.xml b/Login/config/ktlint/baseline.xml new file mode 100644 index 000000000..b1188cce4 --- /dev/null +++ b/Login/config/ktlint/baseline.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Matomo/config/ktlint/baseline.xml b/Matomo/config/ktlint/baseline.xml index f20b26a94..19f55dd6e 100644 --- a/Matomo/config/ktlint/baseline.xml +++ b/Matomo/config/ktlint/baseline.xml @@ -1,8 +1,8 @@ - - - + + + diff --git a/Network/Ktor/config/ktlint/baseline.xml b/Network/Ktor/config/ktlint/baseline.xml new file mode 100644 index 000000000..c21fb4a27 --- /dev/null +++ b/Network/Ktor/config/ktlint/baseline.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Network/config/ktlint/baseline.xml b/Network/config/ktlint/baseline.xml index a34dc3a75..8e48afcbe 100644 --- a/Network/config/ktlint/baseline.xml +++ b/Network/config/ktlint/baseline.xml @@ -1,5 +1,8 @@ + + + @@ -8,16 +11,19 @@ - - + + + + + - - - - - + + + + + diff --git a/Notifications/Registration/config/ktlint/baseline.xml b/Notifications/Registration/config/ktlint/baseline.xml new file mode 100644 index 000000000..2c592dc61 --- /dev/null +++ b/Notifications/Registration/config/ktlint/baseline.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/Notifications/config/ktlint/baseline.xml b/Notifications/config/ktlint/baseline.xml new file mode 100644 index 000000000..bc83c6396 --- /dev/null +++ b/Notifications/config/ktlint/baseline.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Onboarding/config/ktlint/baseline.xml b/Onboarding/config/ktlint/baseline.xml index d55ae2f01..83cf6b7f5 100644 --- a/Onboarding/config/ktlint/baseline.xml +++ b/Onboarding/config/ktlint/baseline.xml @@ -1,12 +1,30 @@ - - + + - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/PermissionManager/config/ktlint/baseline.xml b/PermissionManager/config/ktlint/baseline.xml new file mode 100644 index 000000000..81c9e4012 --- /dev/null +++ b/PermissionManager/config/ktlint/baseline.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/PrivacyManagement/config/ktlint/baseline.xml b/PrivacyManagement/config/ktlint/baseline.xml new file mode 100644 index 000000000..0543eb8c2 --- /dev/null +++ b/PrivacyManagement/config/ktlint/baseline.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sentry/config/ktlint/baseline.xml b/Sentry/config/ktlint/baseline.xml index 439ef67f6..1f26a963a 100644 --- a/Sentry/config/ktlint/baseline.xml +++ b/Sentry/config/ktlint/baseline.xml @@ -1,18 +1,29 @@ + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/SharedValues/config/ktlint/baseline.xml b/SharedValues/config/ktlint/baseline.xml new file mode 100644 index 000000000..80e971cf2 --- /dev/null +++ b/SharedValues/config/ktlint/baseline.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Compose/Margin/config/ktlint/baseline.xml b/TwoFactorAuth/Back/WithUserDb/config/ktlint/baseline.xml similarity index 100% rename from Compose/Margin/config/ktlint/baseline.xml rename to TwoFactorAuth/Back/WithUserDb/config/ktlint/baseline.xml diff --git a/TwoFactorAuth/Back/config/ktlint/baseline.xml b/TwoFactorAuth/Back/config/ktlint/baseline.xml new file mode 100644 index 000000000..d809d3032 --- /dev/null +++ b/TwoFactorAuth/Back/config/ktlint/baseline.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TwoFactorAuth/Front/config/ktlint/baseline.xml b/TwoFactorAuth/Front/config/ktlint/baseline.xml new file mode 100644 index 000000000..581d8612b --- /dev/null +++ b/TwoFactorAuth/Front/config/ktlint/baseline.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ui/Compose/AccountBottomSheet/config/ktlint/baseline.xml b/Ui/Compose/AccountBottomSheet/config/ktlint/baseline.xml new file mode 100644 index 000000000..c75edb9e7 --- /dev/null +++ b/Ui/Compose/AccountBottomSheet/config/ktlint/baseline.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/Ui/Compose/BasicButton/config/ktlint/baseline.xml b/Ui/Compose/BasicButton/config/ktlint/baseline.xml new file mode 100644 index 000000000..ea32e5b46 --- /dev/null +++ b/Ui/Compose/BasicButton/config/ktlint/baseline.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/Ui/Compose/Basics/config/ktlint/baseline.xml b/Ui/Compose/Basics/config/ktlint/baseline.xml new file mode 100644 index 000000000..a595035f7 --- /dev/null +++ b/Ui/Compose/Basics/config/ktlint/baseline.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ui/Compose/BottomStickyButtonScaffolds/config/ktlint/baseline.xml b/Ui/Compose/BottomStickyButtonScaffolds/config/ktlint/baseline.xml new file mode 100644 index 000000000..ca234896f --- /dev/null +++ b/Ui/Compose/BottomStickyButtonScaffolds/config/ktlint/baseline.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Compose/config/ktlint/baseline.xml b/Ui/Compose/Margin/config/ktlint/baseline.xml similarity index 100% rename from Compose/config/ktlint/baseline.xml rename to Ui/Compose/Margin/config/ktlint/baseline.xml diff --git a/Ui/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml b/Ui/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml new file mode 100644 index 000000000..35210a2d4 --- /dev/null +++ b/Ui/Compose/MaterialThemeFromXml/config/ktlint/baseline.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/Ui/Compose/Preview/config/ktlint/baseline.xml b/Ui/Compose/Preview/config/ktlint/baseline.xml new file mode 100644 index 000000000..981420778 --- /dev/null +++ b/Ui/Compose/Preview/config/ktlint/baseline.xml @@ -0,0 +1,3 @@ + + + diff --git a/Ui/Compose/Theme/config/ktlint/baseline.xml b/Ui/Compose/Theme/config/ktlint/baseline.xml new file mode 100644 index 000000000..0f1f13c60 --- /dev/null +++ b/Ui/Compose/Theme/config/ktlint/baseline.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Ui/View/EdgeToEdge/config/ktlint/baseline.xml b/Ui/View/EdgeToEdge/config/ktlint/baseline.xml new file mode 100644 index 000000000..dbadb6451 --- /dev/null +++ b/Ui/View/EdgeToEdge/config/ktlint/baseline.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Ui/View/config/ktlint/baseline.xml b/Ui/View/config/ktlint/baseline.xml new file mode 100644 index 000000000..ef2877591 --- /dev/null +++ b/Ui/View/config/ktlint/baseline.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Ui/config/ktlint/baseline.xml b/Ui/config/ktlint/baseline.xml new file mode 100644 index 000000000..981420778 --- /dev/null +++ b/Ui/config/ktlint/baseline.xml @@ -0,0 +1,3 @@ + + + diff --git a/WebView/config/ktlint/baseline.xml b/WebView/config/ktlint/baseline.xml new file mode 100644 index 000000000..f7f0e9b8a --- /dev/null +++ b/WebView/config/ktlint/baseline.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/kSuite/MykSuite/config/ktlint/baseline.xml b/kSuite/MykSuite/config/ktlint/baseline.xml index fd2df0049..92fb33db0 100644 --- a/kSuite/MykSuite/config/ktlint/baseline.xml +++ b/kSuite/MykSuite/config/ktlint/baseline.xml @@ -1,10 +1,12 @@ + + @@ -36,22 +38,23 @@ - - - - - - - + + + + + + + - - - - - - - + + + + + + + + @@ -60,6 +63,7 @@ + @@ -82,6 +86,7 @@ + @@ -113,7 +118,7 @@ - + diff --git a/kSuite/config/ktlint/baseline.xml b/kSuite/config/ktlint/baseline.xml index dab605f89..981420778 100644 --- a/kSuite/config/ktlint/baseline.xml +++ b/kSuite/config/ktlint/baseline.xml @@ -1,6 +1,3 @@ - - - diff --git a/kSuite/kSuitePro/config/ktlint/baseline.xml b/kSuite/kSuitePro/config/ktlint/baseline.xml index dab605f89..8e1b78209 100644 --- a/kSuite/kSuitePro/config/ktlint/baseline.xml +++ b/kSuite/kSuitePro/config/ktlint/baseline.xml @@ -1,6 +1,38 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9d35e5625b1387ec3514a29df494e0c5e43f1339 Mon Sep 17 00:00:00 2001 From: Vincent Te Date: Thu, 9 Jul 2026 10:34:27 +0200 Subject: [PATCH 5/5] chore: Add plugin convention to apply the ktlint plugin everywhere --- .../kotlin/AndroidLibraryConventionPlugin.kt | 1 + .../src/main/kotlin/KtlintConvention.kt | 23 +++++++++++++++++++ build.gradle.kts | 15 ++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 build-logic/convention/src/main/kotlin/KtlintConvention.kt diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index bbe883c51..4dfe0868d 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -32,6 +32,7 @@ class AndroidLibraryConventionPlugin : Plugin { override fun apply(target: Project): Unit = with(target) { apply(plugin = "com.android.library") apply(plugin = "org.jetbrains.kotlin.android") + applyKtlintConvention() android { applyCommonConfiguration() diff --git a/build-logic/convention/src/main/kotlin/KtlintConvention.kt b/build-logic/convention/src/main/kotlin/KtlintConvention.kt new file mode 100644 index 000000000..07bb5dee9 --- /dev/null +++ b/build-logic/convention/src/main/kotlin/KtlintConvention.kt @@ -0,0 +1,23 @@ +/* + * Infomaniak Core - Android + * Copyright (C) 2026 Infomaniak Network SA + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +import org.gradle.api.Project + +internal fun Project.applyKtlintConvention() { + pluginManager.apply("org.jlleitschuh.gradle.ktlint") +} diff --git a/build.gradle.kts b/build.gradle.kts index e126083c3..594588afc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +import org.jlleitschuh.gradle.ktlint.KtlintExtension import org.jlleitschuh.gradle.ktlint.reporter.ReporterType plugins { @@ -33,3 +34,17 @@ ktlint { reporter(ReporterType.PLAIN) } } + +subprojects { + pluginManager.withPlugin("org.jlleitschuh.gradle.ktlint") { + extensions.configure { + version.set("1.7.1") + android.set(true) + ignoreFailures.set(true) + baseline.set(layout.projectDirectory.file("config/ktlint/baseline.xml")) + reporters { + reporter(ReporterType.PLAIN) + } + } + } +}