ktfmt + jdk22 + gradle actions v4 (#653)

* Update dependency com.facebook:ktfmt to v0.52

* JDK 22 too

* Update CI + formatting

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Zac Sweers <pandanomic@gmail.com>

.github/workflows/ci.yml

@@ -32,7 +32,10 @@ jobs:
  uses: actions/setup-java@v4
  with:
  distribution: 'zulu'
- java-version: '21'
+ java-version: '22'
+
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v4
 
  - name: Setup Gradle
  uses: gradle/actions/setup-gradle@v4
@@ -52,7 +55,10 @@ jobs:
  uses: actions/setup-java@v4
  with:
  distribution: 'zulu'
- java-version: '21'
+ java-version: '22'
+
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@v4
 
  - name: Setup Gradle
  uses: gradle/actions/setup-gradle@v4

gradle/libs.versions.toml

@@ -17,13 +17,13 @@ agp = "8.5.2"
 autoService = "1.1.1"
 gjf = "1.17.0"
 incap = "1.0.0"
-jdk = "21"
+jdk = "22"
 jvmTarget = "11"
 kotlin = "2.0.20"
 kotlinCompileTesting = "0.5.1"
 kotlinpoet = "1.18.1"
 ksp = "2.0.20-1.0.24"
-ktfmt = "0.51"
+ktfmt = "0.52"
 moshi = "1.15.1"
 okhttp = "4.12.0"
 retrofit = "2.11.0"
@@ -37,7 +37,7 @@ lint = { id = "com.android.lint", version = "8.7.0-alpha08" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
 mavenShadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
 moshix = { id = "dev.zacsweers.moshix", version = "0.28.0" } # Always replaced by the local plugin
-spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
+spotless = { id = "com.diffplug.spotless", version = "7.0.0.BETA2" }
 
 [libraries]
 agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }

moshi-metadata-reflect/src/main/kotlin/dev/zacsweers/moshix/reflect/KtTypes.kt

@@ -150,7 +150,8 @@ internal data class KtConstructor(
  }
 
  if (!isDefault) {
- @Suppress("UNCHECKED_CAST") return jvm.newInstance(*arguments.toTypedArray()) as R
+ @Suppress("UNCHECKED_CAST")
+ return jvm.newInstance(*arguments.toTypedArray()) as R
  }
 
  masks += mask
@@ -159,7 +160,8 @@ internal data class KtConstructor(
  // DefaultConstructorMarker
  arguments += null
 
- @Suppress("UNCHECKED_CAST") return jvm.newInstance(*arguments.toTypedArray()) as R
+ @Suppress("UNCHECKED_CAST")
+ return jvm.newInstance(*arguments.toTypedArray()) as R
  }
 
  companion object {