Bump clikt, expediter, gradle (#76)

open-toast · Oct 15, 2024 · a11bae5 · a11bae5
1 parent c579429
commit a11bae5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 kotlin = "2.0.21"
 animalSniffer = "1.24"
-clikt = "4.4.0"
-expediter = "0.0.21"
+clikt = "5.0.1"
+expediter = "0.0.22"
 desugarJdkLibs = "1.2.3"
 desugarJdkLibs2 = "2.0.4"
 r8 = "1.5.68"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...-builder/src/main/kotlin/com/toasttab/android/descriptors/AndroidTypeDescriptorBuilder.kt b/...-builder/src/main/kotlin/com/toasttab/android/descriptors/AndroidTypeDescriptorBuilder.kt
@@ -16,6 +16,7 @@
 package com.toasttab.android.descriptors
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.parameters.options.multiple
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.options.required
@@ -41,15 +42,15 @@ class AndroidTypeDescriptorBuilder : CliktCommand() {
         val signatures = MutableTypeDescriptors(
             ClasspathScanner(
                 listOf(
-                    ClassfileSource(File(sdk), ClassfileSourceType.UNKNOWN, sdk)
+                    ClassfileSource(File(sdk), ClassfileSourceType.UNKNOWN)
                 )
             ).scan { stream, _ -> TypeParsers.typeDescriptor(stream) }
         )
 
         for (more in desugared) {
             ClasspathScanner(
                 listOf(
-                    ClassfileSource(File(more), ClassfileSourceType.UNKNOWN, more)
+                    ClassfileSource(File(more), ClassfileSourceType.UNKNOWN)
                 )
             ).scan { stream, _ -> TransformedTypeDescriptor(TypeParsers.typeDescriptor(stream)) }
                 .sortedBy { it.priority }

diff --git a/test/api-treadmill/src/main/java/com/toasttab/android/ApiUseGenerator.kt b/test/api-treadmill/src/main/java/com/toasttab/android/ApiUseGenerator.kt
@@ -16,6 +16,7 @@
 package com.toasttab.android
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.parameters.options.multiple
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.options.required