From dff31c29ecef319bdce908af6cf8bd76c7e50ee9 Mon Sep 17 00:00:00 2001
From: cfig <yuyezhong@gmail.com>
Date: Tue, 20 May 2025 10:14:46 +0800
Subject: [PATCH] mass update

gradle 8.14
kotlin 2.1.21
---
 bbootimg/build.gradle.kts                     | 2 +-
 bbootimg/src/main/kotlin/bootimg/v2/BootV2.kt | 4 ++--
 gradle/wrapper/gradle-wrapper.properties      | 2 +-
 helper/build.gradle.kts                       | 2 +-
 lazybox/build.gradle.kts                      | 2 +-
 settings.gradle.kts                           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bbootimg/build.gradle.kts b/bbootimg/build.gradle.kts
index 67ceee8..8243c89 100644
--- a/bbootimg/build.gradle.kts
+++ b/bbootimg/build.gradle.kts
@@ -15,7 +15,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "2.1.20"
+    kotlin("jvm") version "2.1.21"
     application
 }
 
diff --git a/bbootimg/src/main/kotlin/bootimg/v2/BootV2.kt b/bbootimg/src/main/kotlin/bootimg/v2/BootV2.kt
index 6fbb990..9530d06 100644
--- a/bbootimg/src/main/kotlin/bootimg/v2/BootV2.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v2/BootV2.kt
@@ -365,8 +365,8 @@ data class BootV2(
                     it.addRow("dtb", theDtb.file?.let { fullPath -> shortenPath(fullPath) })
                     prints.add(Pair("dtb", shortenPath(theDtb.file.toString())))
                     if (File(theDtb.file + ".0.${dtsSuffix}").exists()) {
-                        it.addRow("\\-- decompiled dts [$dtbCount]", shortenPath(theDtb.file + ".*.${dtsSuffix}"))
-                        prints.add(Pair("\\-- decompiled dts [$dtbCount]", shortenPath(theDtb.file + ".*.${dtsSuffix}")))
+                        it.addRow("\\-- decompiled dts [$dtbCount]", shortenPath(theDtb.file!!) + ".*.${dtsSuffix}")
+                        prints.add(Pair("\\-- decompiled dts [$dtbCount]", shortenPath(theDtb.file!!) + ".*.${dtsSuffix}"))
                     }
                 }
             }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0d18421..5c82cb0 100644
--- 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.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/helper/build.gradle.kts b/helper/build.gradle.kts
index ae2c7f8..288b4d6 100644
--- a/helper/build.gradle.kts
+++ b/helper/build.gradle.kts
@@ -15,7 +15,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "2.1.20"
+    kotlin("jvm") version "2.1.21"
     `java-library`
     application
 }
diff --git a/lazybox/build.gradle.kts b/lazybox/build.gradle.kts
index 8bf5937..ea9467e 100644
--- a/lazybox/build.gradle.kts
+++ b/lazybox/build.gradle.kts
@@ -8,7 +8,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "2.1.20"
+    kotlin("jvm") version "2.1.21"
     application
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3486129..9a7b5fc 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        kotlin("jvm") version "2.1.20"
+        kotlin("jvm") version "2.1.21"
     }
 }
 rootProject.name = "boot"