update: 修复依赖重定向问题

BingZi-233 · Oct 22, 2024 · bf345f3 · bf345f3
1 parent e576b2a
commit bf345f3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -20,11 +20,8 @@ taboolib {
     }
 
     relocate("retrofit2", "online.bingzi.bilibili.video.library.retrofit2")
-    relocate("okhttp3", "online.bingzi.bilibili.video.library.okhttp3")
-    relocate("okio", "online.bingzi.bilibili.video.library.okio")
-    relocate("com.google.gson", "online.bingzi.bilibili.video.library.gson")
     relocate("com.github.ben-manes", "online.bingzi.bilibili.video.library.caffeine")
-    relocate("com.google.zxing", "oonline.bingzi.bilibili.video.library.zxing")
+    relocate("com.google.zxing", "online.bingzi.bilibili.video.library.zxing")
     relocate("com.j256.ormlite", "online.bingzi.bilibili.video.library.ormlite")
     relocate("com.zaxxer.hikari", "online.bingzi.bilibili.video.library.hikari")
     relocate("org.sqlite", "online.bingzi.bilibili.video.library.sqlite")

diff --git a/project/cache/src/main/kotlin/online/bingzi/bilibili/video/internal/cache/Cache.kt b/project/cache/src/main/kotlin/online/bingzi/bilibili/video/internal/cache/Cache.kt
@@ -19,7 +19,7 @@ import java.util.*
  * @since 2.0.0
  */
 @RuntimeDependencies(
-    RuntimeDependency(value = "!com.github.ben-manes.caffeine:caffeine:2.9.2")
+    RuntimeDependency(value = "!com.github.ben-manes.caffeine:caffeine:2.9.2", relocate = ["!com.github.ben-manes", "!online.bingzi.bilibili.video.library.caffeine"])
 )
 object Cache {
     /**

diff --git a/project/core/src/main/kotlin/online/bingzi/bilibili/video/internal/helper/ImageHelper.kt b/project/core/src/main/kotlin/online/bingzi/bilibili/video/internal/helper/ImageHelper.kt
@@ -16,7 +16,7 @@ import java.awt.image.BufferedImage
  * @author BingZi-233
  * @since 2.0.0
  */
-@RuntimeDependency(value = "!com.google.zxing:core:3.5.2", test = "com.google.zxing.qrcode.QRCodeWriter")
+@RuntimeDependency(value = "!com.google.zxing:core:3.5.2", relocate = ["!com.google.zxing", "!online.bingzi.bilibili.video.library.zxing"])
 object ImageHelper {
     /**
      * String to buffer image

diff --git a/project/database/src/main/kotlin/online/bingzi/bilibili/video/internal/database/Database.kt b/project/database/src/main/kotlin/online/bingzi/bilibili/video/internal/database/Database.kt
@@ -18,11 +18,11 @@ import taboolib.common.env.RuntimeDependency
  * @since 2.0.0
  */
 @RuntimeDependencies(
-    RuntimeDependency(value = "!com.j256.ormlite:ormlite-core:6.1"),
-    RuntimeDependency(value = "!com.j256.ormlite:ormlite-jdbc:6.1"),
-    RuntimeDependency(value = "!org.xerial:sqlite-jdbc:3.46.1.3"),
-    RuntimeDependency(value = "!com.zaxxer:HikariCP:4.0.3"),
-    RuntimeDependency(value = "!com.mysql:mysql-connector-j:8.2.0"),
+    RuntimeDependency(value = "!com.j256.ormlite:ormlite-core:6.1", relocate = ["!com.j256.ormlite", "!online.bingzi.bilibili.video.library.ormlite"]),
+    RuntimeDependency(value = "!com.j256.ormlite:ormlite-jdbc:6.1", relocate = ["!com.j256.ormlite", "!online.bingzi.bilibili.video.library.ormlite"]),
+    RuntimeDependency(value = "!org.xerial:sqlite-jdbc:3.46.1.3", relocate = ["!org.sqlite", "!online.bingzi.bilibili.video.library.sqlite"]),
+    RuntimeDependency(value = "!com.zaxxer:HikariCP:4.0.3", relocate = ["!com.zaxxer.hikari", "!online.bingzi.bilibili.video.library.hikari"]),
+    RuntimeDependency(value = "!com.mysql:mysql-connector-j:8.2.0", relocate = ["!org.mysql", "!online.bingzi.bilibili.video.library.mysql"]),
 )
 internal object Database {
     /**