Merge pull request #365 from usefulness/renovate/major-clikt

Update dependency com.github.ajalt.clikt:clikt to v5
usefulness · Sep 22, 2024 · 0f9befb · 0f9befb
2 parents 363fae2 + 449afaf
commit 0f9befb
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/diffuse/build.gradle b/diffuse/build.gradle
@@ -25,6 +25,7 @@ def fatJarProvider = tasks.register('fatJar', Jar) { task ->
   task.dependsOn(tasks.named('jar'))
 
   task.archiveClassifier.set('fat')
+  task.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
   task.manifest {
     attributes 'Main-Class': 'com.jakewharton.diffuse.Diffuse'

diff --git a/diffuse/src/main/kotlin/com/jakewharton/diffuse/diffuse.kt b/diffuse/src/main/kotlin/com/jakewharton/diffuse/diffuse.kt
@@ -3,8 +3,10 @@
 package com.jakewharton.diffuse
 
 import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
 import com.github.ajalt.clikt.core.NoOpCliktCommand
 import com.github.ajalt.clikt.core.ParameterHolder
+import com.github.ajalt.clikt.core.main
 import com.github.ajalt.clikt.core.subcommands
 import com.github.ajalt.clikt.parameters.arguments.argument
 import com.github.ajalt.clikt.parameters.groups.OptionGroup
@@ -142,12 +144,14 @@ private class InfoCommand(
   inputFs: FileSystem,
   outputFs: FileSystem,
   output: PrintStream,
-) : CliktCommand(name = "info", help = "Display info about a binary.") {
+) : CliktCommand(name = "info") {
   private val type by binaryType()
   private val outputOptions by OutputOptions(outputFs, output)
   private val file by argument("FILE", help = "Input file.")
     .path(mustExist = true, canBeDir = false, mustBeReadable = true, fileSystem = inputFs)
 
+  override fun help(context: Context) = "Display info about a binary."
+
   override fun run() {
     val info = when (type) {
       BinaryType.Apk -> ApkInfo(file.asInput().toApk())
@@ -164,7 +168,7 @@ private class DiffCommand(
   inputFs: FileSystem,
   outputFs: FileSystem,
   output: PrintStream,
-) : CliktCommand(name = "diff", help = "Display changes between two binaries.") {
+) : CliktCommand(name = "diff") {
   private val inputOptions by object : OptionGroup("Input options") {
     private val type by binaryType()
 
@@ -188,6 +192,8 @@ private class DiffCommand(
   private val new by argument("NEW", help = "New input file.")
     .path(mustExist = true, canBeDir = false, mustBeReadable = true, fileSystem = inputFs)
 
+  override fun help(context: Context) = "Display changes between two binaries."
+
   override fun run() {
     val diff = inputOptions.parse(old.asInput(), new.asInput())
     outputOptions.write(diff)
@@ -197,7 +203,7 @@ private class DiffCommand(
 private class MembersCommand(
   inputFs: FileSystem,
   private val stdout: PrintStream,
-) : CliktCommand(name = "members", help = "List methods or fields of a binary.") {
+) : CliktCommand(name = "members") {
   private val binary by argument("FILE", help = "Input file.")
     .path(mustExist = true, canBeDir = false, mustBeReadable = true, fileSystem = inputFs)
 
@@ -237,6 +243,8 @@ private class MembersCommand(
     Referenced,
   }
 
+  override fun help(context: Context) = "List methods or fields of a binary."
+
   override fun run() {
     val input = binary.asInput()
 

diff --git a/diffuse/src/main/rules.pro b/diffuse/src/main/rules.pro
@@ -23,11 +23,3 @@
 ##############
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 
-##############
-### Clikt ###
-##############
--keep class com.sun.jna.** { *; }
--keep class * implements com.sun.jna.** { *; }
--keepattributes RuntimeVisibleAnnotations,RuntimeVisibleParameterAnnotations,RuntimeVisibleTypeAnnotations,AnnotationDefault
--dontwarn org.graalvm.**
--dontwarn com.oracle.svm.core.annotate.Delete
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ guava = "31.0.1-jre"
 dalvikdx = "14.0.0_r21"
 apkparser = "31.6.1"
 apksign = "8.6.1"
-clikt = "4.4.0"
+clikt = "5.0.0"
 junit = "5.11.0"
 okio = "3.9.1"
 byteunits = "0.9.1"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME