Update dependencies and add Barn support

linkie · Feb 17, 2023 · 5c6b837 · 5c6b837
1 parent 7bc8bd1
commit 5c6b837
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/backend/build.gradle b/backend/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.7.10"
-    id "org.jetbrains.kotlin.plugin.serialization" version "1.7.10"
-    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "org.jetbrains.kotlin.jvm" version "1.8.10"
+    id "org.jetbrains.kotlin.plugin.serialization" version "1.8.10"
+    id "com.github.johnrengelman.shadow" version "7.1.2"
 }
 
 group = "me.shedaniel"
@@ -28,18 +28,18 @@ configurations {
 }
 
 dependencies {
-    implementation("me.shedaniel:linkie-core:1.0.107")
-    implementation('io.ktor:ktor-server-cors:2.1.0')
-    implementation('io.ktor:ktor-server-content-negotiation:2.1.0')
-    implementation('io.ktor:ktor-server-status-pages:2.1.0')
-    implementation('io.ktor:ktor-client-content-negotiation:2.1.0')
-    implementation('io.ktor:ktor-serialization-kotlinx-json:2.1.0')
-    implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.84.2")
-    implementation 'io.ktor:ktor-server-core-jvm:2.1.0'
-    implementation 'io.ktor:ktor-server-netty-jvm:2.1.0'
-    implementation 'io.ktor:ktor-client-java-jvm:2.1.0'
-    implementation 'io.ktor:ktor-client-core-jvm:2.1.0'
-    implementation 'com.github.Baw-Appie:ktor-rate-limit:1cf36fe'
+    implementation("me.shedaniel:linkie-core:1.0.111")
+    implementation("io.ktor:ktor-server-cors:2.2.3")
+    implementation("io.ktor:ktor-server-content-negotiation:2.2.3")
+    implementation("io.ktor:ktor-server-status-pages:2.2.3")
+    implementation("io.ktor:ktor-client-content-negotiation:2.2.3")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:2.2.3")
+    implementation("io.github.pdvrieze.xmlutil:serialization-jvm:0.84.3")
+    implementation("io.ktor:ktor-server-core-jvm:2.2.3")
+    implementation("io.ktor:ktor-server-netty-jvm:2.2.3")
+    implementation("io.ktor:ktor-client-java-jvm:2.2.3")
+    implementation("io.ktor:ktor-client-core-jvm:2.2.3")
+    implementation("com.github.Baw-Appie:ktor-rate-limit:1cf36fe")
 }
 
 jar {
@@ -61,5 +61,5 @@ shadowJar {
 build.finalizedBy shadowJar
 
 compileKotlin {
-    kotlinOptions.jvmTarget = '1.8'
+    kotlinOptions.jvmTarget = "1.8"
 }
diff --git a/backend/src/main/kotlin/me/shedaniel/linkie/web/LinkieWebServer.kt b/backend/src/main/kotlin/me/shedaniel/linkie/web/LinkieWebServer.kt
@@ -67,6 +67,7 @@ val json = Json {
     explicitNulls = false
 }
 
+@Suppress("ExtractKtorModule")
 fun main() {
     depsCycle()
     startDepsCycle()

diff --git a/backend/src/main/kotlin/me/shedaniel/linkie/web/deps/Deps.kt b/backend/src/main/kotlin/me/shedaniel/linkie/web/deps/Deps.kt
@@ -8,6 +8,7 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import me.shedaniel.linkie.LinkieConfig
 import me.shedaniel.linkie.Namespaces
+import me.shedaniel.linkie.namespaces.BarnNamespace
 import me.shedaniel.linkie.namespaces.LegacyYarnNamespace
 import me.shedaniel.linkie.namespaces.MCPNamespace
 import me.shedaniel.linkie.namespaces.MojangHashedNamespace
@@ -150,6 +151,7 @@ fun startLinkie() {
                     LegacyYarnNamespace,
                     YarrnNamespace,
                     PlasmaNamespace,
+                    BarnNamespace,
                 )
             )
         )

diff --git a/frontend/src/components/Alerts.vue b/frontend/src/components/Alerts.vue
@@ -36,7 +36,7 @@
     <div class="fixed top-20 right-10 z-5">
         <TransitionGroup name="list" tag="div">
             <div v-for="notification in Object.keys(notifications)" :key="notifications[notification as unknown as number].message" @click="removeNotification(notification as unknown as number)"
-                 class="mt-4 bg-base-100 p-3 shadow-lg rounded-md ring-4 ring-black ring-opacity-20">
+                 class="mt-4 bg-base-100 dark:bg-base-dark-300 p-3 shadow-lg rounded-md ring-4 ring-black ring-opacity-20">
                 {{ notifications[notification as unknown as number].message }}
             </div>
         </TransitionGroup>

diff --git a/frontend/src/locales/en_US.json b/frontend/src/locales/en_US.json
@@ -48,6 +48,7 @@
     "namespace.mcp": "MCP",
     "namespace.quilt-mappings": "Quilt Mappings",
     "namespace.legacy-yarn": "Legacy Yarn",
+    "namespace.barn": "Barn",
     "namespace.yarrn": "Yarrn",
     "namespace.plasma": "Plasma",
     "loader.fabric": "Fabric",