Update sortDependencies to 0.9

CHANGELOG.md

@@ -56,6 +56,7 @@ We've restructured this project! Since its early days as a simple Gradle convent
 - Build against gradle-nullaway `2.0.0`.
 - Build against Gradle versions plugin `0.51.0`.
 - Build against Develocity plugin `3.18.1`.
+- Build against gradle-dependencies-sorter plugin `0.9`.
 
 0.19.6
 ------

gradle/libs.versions.toml

@@ -38,7 +38,7 @@ okhttp = "5.0.0-alpha.12"
 okio = "3.9.1"
 retrofit = "2.11.0"
 slack-lint = "0.8.1"
-sortDependencies = "0.7"
+sortDependencies = "0.9"
 spotless = "7.0.0.BETA2"
 sqldelight = "2.0.2"
 versionsPlugin = "0.51.0"

platforms/gradle/agp-handlers/agp-handler-api/build.gradle.kts

@@ -20,7 +20,6 @@ plugins {
 }
 
 dependencies {
- lintChecks(libs.gradleLints)
  implementation(libs.guava)
 
  compileOnly(gradleApi())
@@ -30,4 +29,6 @@ dependencies {
  testImplementation(libs.agp)
  testImplementation(libs.junit)
  testImplementation(libs.truth)
+
+ lintChecks(libs.gradleLints)
 }

platforms/gradle/foundry-gradle-plugin/build.gradle.kts

@@ -69,8 +69,6 @@ dependencies.constraints {
 }
 
 dependencies {
- lintChecks(libs.gradleLints)
-
  api(platform(libs.okhttp.bom))
  api(libs.okhttp)
  // Better I/O
@@ -129,4 +127,6 @@ dependencies {
  testImplementation(libs.junit)
  testImplementation(libs.okio.fakefilesystem)
  testImplementation(libs.truth)
+
+ lintChecks(libs.gradleLints)
 }

platforms/intellij/skate/build.gradle.kts

@@ -118,39 +118,41 @@ configurations
  .configureEach { attributes { attribute(KotlinPlatformType.attribute, KotlinPlatformType.jvm) } }
 
 dependencies {
- lintChecks(libs.composeLints)
-
- compileOnly(libs.coroutines.core.ij)
+ implementation(projects.platforms.intellij.compose, exclusions)
+ implementation(projects.tools.tracing, exclusions)
 
  implementation(libs.bugsnag)
- implementation(libs.okio)
  implementation(libs.kaml)
  implementation(libs.kotlinx.serialization.core)
  implementation(libs.okhttp)
  implementation(libs.okhttp.loggingInterceptor)
- implementation(projects.platforms.intellij.compose, exclusions)
- implementation(projects.tools.tracing, exclusions)
+ implementation(libs.okio)
 
- intellijPlatform {
- // https://plugins.jetbrains.com/docs/intellij/android-studio.html#open-source-plugins-for-android-studio
- // https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
- // https://plugins.jetbrains.com/plugin/22989-android/versions/stable
- plugin("org.jetbrains.android:242.21829.142")
- bundledPlugins(
- "com.intellij.java",
- "org.intellij.plugins.markdown",
- "org.jetbrains.plugins.terminal",
- "org.jetbrains.kotlin",
- )
-
- pluginVerifier()
- zipSigner()
- instrumentationTools()
-
- testFramework(TestFrameworkType.Platform)
- testFramework(TestFrameworkType.Bundled)
- }
+ compileOnly(libs.coroutines.core.ij)
 
  testImplementation(libs.junit)
  testImplementation(libs.truth)
+
+ lintChecks(libs.composeLints)
+}
+
+// Can't nest this inside of dependencies {} because otherwise the dependency sorter will remove it
+dependencies.intellijPlatform {
+ // https://plugins.jetbrains.com/docs/intellij/android-studio.html#open-source-plugins-for-android-studio
+ // https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
+ // https://plugins.jetbrains.com/plugin/22989-android/versions/stable
+ plugin("org.jetbrains.android:242.21829.142")
+ bundledPlugins(
+ "com.intellij.java",
+ "org.intellij.plugins.markdown",
+ "org.jetbrains.plugins.terminal",
+ "org.jetbrains.kotlin",
+ )
+
+ pluginVerifier()
+ zipSigner()
+ instrumentationTools()
+
+ testFramework(TestFrameworkType.Platform)
+ testFramework(TestFrameworkType.Bundled)
 }

tools/cli/build.gradle.kts

@@ -43,8 +43,6 @@ if (System.getenv("CI") != null) {
 }
 
 dependencies {
- ksp(libs.autoService.ksp)
-
  api(libs.clikt)
 
  implementation(libs.autoService.annotations)
@@ -63,4 +61,6 @@ dependencies {
 
  testImplementation(libs.junit)
  testImplementation(libs.truth)
+
+ ksp(libs.autoService.ksp)
 }