mirrors/Tachidesk
1
0
Fork 0
mirror of https://github.com/Suwayomi/Tachidesk.git synced 2025-12-10 06:42:07 +01:00
Code Issues Projects Releases Wiki Activity

Fixe Dex2Jar and dorkbox dependency issues (#487)

Browse Source 
Co-authored-by: akxer <>
This commit is contained in:
akabhirav
2023-02-05 20:43:00 +05:30
committed by GitHub
parent 55894c22a4
commit acc58dc892
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -2,7 +2,7 @@
.gradle .gradle
.idea .idea
gradle.properties gradle.properties
.fleet
# But we need these # But we need these
!.idea/runConfigurations !.idea/runConfigurations

8
gradle/libs.versions.toml
View File

@@ -6,7 +6,7 @@ okhttp = "4.10.0" # Major version is locked by Tachiyomi extensions
javalin = "4.6.6" # Javalin 5.0.0+ requires Java 11 javalin = "4.6.6" # Javalin 5.0.0+ requires Java 11
jackson = "2.13.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency` jackson = "2.13.3" # jackson version locked by javalin, ref: `io.javalin.core.util.OptionalDependency`
exposed = "0.40.1" exposed = "0.40.1"
dex2jar = "v56" dex2jar = "v59"
rhino = "1.7.14" rhino = "1.7.14"
settings = "1.0.0-RC" settings = "1.0.0-RC"
twelvemonkeys = "3.9.4" twelvemonkeys = "3.9.4"
@@ -63,8 +63,9 @@ exposed-migrations = "com.github.Suwayomi:exposed-migrations:3.2.0"
kodein = "org.kodein.di:kodein-di-conf-jvm:7.15.0" kodein = "org.kodein.di:kodein-di-conf-jvm:7.15.0"
# tray icon # tray icon
systemtray-core = "com.dorkbox:SystemTray:4.2" systemtray-core = "com.dorkbox:SystemTray:4.1"
systemtray-utils = "com.dorkbox:Utilities:1.39" # version locked by SystemTray systemtray-utils = "com.dorkbox:Utilities:1.9" # version locked by SystemTray
systemtray-desktop = "com.dorkbox:Desktop:1.0"
# dependencies of Tachiyomi extensions # dependencies of Tachiyomi extensions
injekt = "com.github.inorichi.injekt:injekt-core:65b0440" injekt = "com.github.inorichi.injekt:injekt-core:65b0440"
@@ -198,6 +199,7 @@ exposed = [
systemtray = [ systemtray = [
"systemtray-core", "systemtray-core",
"systemtray-utils", "systemtray-utils",
"systemtray-desktop"
] ]
rhino = [ rhino = [
"rhino-runtime", "rhino-runtime",

2
server/src/main/kotlin/suwayomi/tachidesk/server/util/Browser.kt
View File

@@ -7,7 +7,7 @@ package suwayomi.tachidesk.server.util
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
import dorkbox.util.Desktop import dorkbox.desktop.Desktop
import suwayomi.tachidesk.server.serverConfig import suwayomi.tachidesk.server.serverConfig
object Browser { object Browser {