[#841] Ktlint 0.48.0

* [#841] Ktlint 0.48.0

* Update + Suppress

- Missing-trailing-comma globally
- Broken no-semi rule locally
- Fixed few other minor formatting troubles

.idea/codeStyles/Project.xml

@@ -8,8 +8,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

build-conventions/src/main/kotlin/zcash-sdk.ktlint-conventions.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
 }
 
 tasks {
-    val editorConfigFile = rootProject.file(".editorconfig")
+    val editorConfigFile = rootProject.file("tools/.editorconfig")
     val ktlintArgs = listOf("**/src/**/*.kt", "!**/build/**.kt", "--editorconfig=$editorConfigFile")
 
     register("ktlint", org.gradle.api.tasks.JavaExec::class) {

darkside-test-lib/src/androidTest/java/cash/z/ecc/android/sdk/darkside/test/TestWallet.kt

@@ -164,6 +164,9 @@ class TestWallet(
         }
     }
 
+    // TODO [843]: Ktlint 0.48.1 (remove this suppress)
+    // TODO [843]: https://github.com/zcash/zcash-android-wallet-sdk/issues/843
+    @Suppress("ktlint:no-semi")
     enum class Backups(val seedPhrase: String, val testnetBirthday: BlockHeight, val mainnetBirthday: BlockHeight) {
         // TODO: get the proper birthday values for these wallets
         DEFAULT(
@@ -205,7 +208,6 @@ class TestWallet(
                 1_330_190
             ),
             BlockHeight.new(ZcashNetwork.Mainnet, 1_000_000)
-        )
-        ;
+        );
     }
 }

gradle.properties

@@ -81,7 +81,7 @@ EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.0.12
 FLANK_VERSION=22.10.0
 FULLADLE_VERSION=0.17.4
 GRADLE_VERSIONS_PLUGIN_VERSION=0.44.0
-KTLINT_VERSION=0.47.1
+KTLINT_VERSION=0.48.0
 KSP_VERSION=1.7.21-1.0.8
 PROTOBUF_GRADLE_PLUGIN_VERSION=0.8.19
 RUST_GRADLE_PLUGIN_VERSION=0.9.3

sdk-lib/src/androidTest/java/cash/z/ecc/android/sdk/util/TestWallet.kt

@@ -166,6 +166,9 @@ class TestWallet(
         }
     }
 
+    // TODO [843]: Ktlint 0.48.1 (remove this suppress)
+    // TODO [843]: https://github.com/zcash/zcash-android-wallet-sdk/issues/843
+    @Suppress("ktlint:no-semi")
     enum class Backups(val seedPhrase: String, val testnetBirthday: BlockHeight, val mainnetBirthday: BlockHeight) {
         // TODO: get the proper birthday values for these wallets
         DEFAULT(
@@ -207,7 +210,6 @@ class TestWallet(
                 1_330_190
             ),
             BlockHeight.new(ZcashNetwork.Mainnet, 1_000_000)
-        )
-        ;
+        );
     }
 }

sdk-lib/src/main/java/cash/z/ecc/android/sdk/ext/ConsensusBranchId.kt

@@ -7,7 +7,9 @@ import java.util.Locale
  * omitted since this is not the source of truth for branch information but rather a tool for
  * printing that information to users.
  */
-@Suppress("MagicNumber")
+// TODO [843]: Ktlint 0.48.1 (remove this suppress)
+// TODO [843]: https://github.com/zcash/zcash-android-wallet-sdk/issues/843
+@Suppress("MagicNumber", "ktlint:no-semi")
 enum class ConsensusBranchId(val displayName: String, val id: Long, val hexId: String) {
     // TODO [#679]: see if we can find a way to not rely on this separate source of truth (either stop converting from
     //  hex to display name in the apps or use Rust to get this info)

tools/.editorconfig

@@ -12,3 +12,9 @@ disabled_rules=import-ordering,no-wildcard-imports
 ij_kotlin_imports_layout=* # alphabetical with capital letters before lower case letters (e.g. Z before a), no blank lines
 ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^ # default IntelliJ IDEA style, same as alphabetical, but with "java", "javax", "kotlin" and alias imports in the end of the imports list
 ij_kotlin_imports_layout=android.**,|,^org.junit.**,kotlin.io.Closeable.*,|,*,^ # custom imports layout
+
+# Opt-out from missing-trailing-comma rule enabled by default
+root = true
+[*.{kt,kts}]
+ktlint_standard_trailing-comma-on-call-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled