Merge 01e75ac83d into 356fd7baab

Merge pull request #4870 from lissy93-forks/ignore-kotlin-gradle
Adds .kotlin to Android.gitignore
2026-10-31 15:12:36 +01:00 · 2026-09-11 13:23:10 -07:00 · 2026-09-11 09:15:42 -07:00 · 2026-06-07 21:00:00 +01:00 · 2025-11-10 22:16:16 +08:00
2 changed files with 5 additions and 1 deletions
@@ -1,6 +1,7 @@
 # Gradle files
 .gradle/
 build/
+.kotlin/

 # Local configuration file (sdk path, etc)
 local.properties
@@ -4,7 +4,10 @@
 __MACOSX/
 .AppleDouble
 .LSOverride
-Icon[␍]
+
+# Finder custom icons
+# Pattern [^!-~] prevents corruption by line-ending converters and editor auto-formatting
+Icon[^!-~]

 # Resource forks
 ._*
Author	SHA1	Message	Date
silentip404	8cd9fa9dc4	Merge `01e75ac83d` into `356fd7baab`	2026-09-11 13:23:10 -07:00
Devin Dooley	356fd7baab	Merge pull request #4870 from lissy93-forks/ignore-kotlin-gradle Adds .kotlin to Android.gitignore	2026-09-11 09:15:42 -07:00
Alicia Sykes	02789433d9	Ignore .kotlin gradle generated dir	2026-06-07 21:00:00 +01:00
silentip404	01e75ac83d	Improve macOS Icon pattern to prevent collaboration issues Replace invisible CR with character class Icon[^!-~] The literal CR character is frequently corrupted by: - Text editors auto-trimming invisible chars - Formatting tools (editorconfig) normalizing line endings - Copy/paste operations losing special characters - IDE auto-formatting and linting tools Character class pattern is collaboration-safe and functionally identical.	2025-11-10 22:16:16 +08:00