Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@schnapster
schnapster committed Jun 24, 2023
1 parent 1d49d39 commit 6694d65
Show file tree
Hide file tree
Showing 15 changed files with 579 additions and 537 deletions.
83 changes: 42 additions & 41 deletions buildscript-gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ com.fasterxml.jackson.core:jackson-core:2.14.2=classpath
com.fasterxml.jackson.core:jackson-databind:2.14.2=classpath
com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.2=classpath
com.fasterxml.jackson:jackson-bom:2.14.2=classpath
com.github.ben-manes:gradle-versions-plugin:0.46.0=classpath
com.github.ben-manes:gradle-versions-plugin:0.47.0=classpath
com.github.docker-java:docker-java-api:3.2.13=classpath
com.github.docker-java:docker-java-core:3.2.13=classpath
com.github.docker-java:docker-java-transport-httpclient5:3.2.13=classpath
Expand All @@ -19,22 +19,23 @@ com.google.guava:guava:19.0=classpath
com.googlecode.javaewah:JavaEWAH:1.1.13=classpath
com.squareup.moshi:moshi-kotlin:1.12.0=classpath
com.squareup.moshi:moshi:1.12.0=classpath
com.squareup.okhttp3:okhttp:4.9.3=classpath
com.squareup.okio:okio:2.10.0=classpath
com.squareup.okhttp3:okhttp:4.11.0=classpath
com.squareup.okio:okio-jvm:3.2.0=classpath
com.squareup.okio:okio:3.2.0=classpath
com.sun.activation:jakarta.activation:2.0.1=classpath
com.sun.istack:istack-commons-runtime:4.0.1=classpath
com.thoughtworks.xstream:xstream:1.4.19=classpath
com.thoughtworks.xstream:xstream:1.4.20=classpath
commons-io:commons-io:2.6=classpath
gradle.plugin.com.gorylenko.gradle-git-properties:gradle-git-properties:2.2.4=classpath
gradle.plugin.org.flywaydb:gradle-plugin-publishing:9.19.1=classpath
gradle.plugin.org.flywaydb:gradle-plugin-publishing:9.20.0=classpath
io.github.x-stream:mxparser:1.2.2=classpath
io.r2dbc:r2dbc-spi:1.0.0.RELEASE=classpath
io.spring.gradle:dependency-management-plugin:1.1.0=classpath
jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=classpath
javax.activation:activation:1.1.1=classpath
net.java.dev.jna:jna-platform:5.7.0=classpath
net.java.dev.jna:jna:5.8.0=classpath
nu.studer:gradle-jooq-plugin:8.2=classpath
nu.studer:gradle-jooq-plugin:8.2.1=classpath
org.ajoberstar.grgit:grgit-core:5.2.0=classpath
org.ajoberstar.grgit:grgit-gradle:5.2.0=classpath
org.antlr:antlr4-runtime:4.7.2=classpath
Expand All @@ -47,41 +48,41 @@ org.bouncycastle:bcpkix-jdk15on:1.64=classpath
org.bouncycastle:bcprov-jdk15on:1.64=classpath
org.codehaus.groovy:groovy:3.0.17=classpath
org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r=classpath
org.flywaydb:flyway-core:9.19.1=classpath
org.flywaydb:flyway-core:9.20.0=classpath
org.fusesource.jansi:jansi:2.4.0=classpath
org.glassfish.jaxb:jaxb-core:3.0.2=classpath
org.glassfish.jaxb:jaxb-runtime:3.0.2=classpath
org.glassfish.jaxb:txw2:3.0.2=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
org.jetbrains.kotlin:kotlin-allopen:1.8.21=classpath
org.jetbrains.kotlin:kotlin-android-extensions:1.8.21=classpath
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.21=classpath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.21=classpath
org.jetbrains.kotlin:kotlin-compiler-runner:1.8.21=classpath
org.jetbrains.kotlin:kotlin-daemon-client:1.8.21=classpath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.21=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.8.21=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.21=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.21=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.21=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.21=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21=classpath
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.8.21=classpath
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.21=classpath
org.jetbrains.kotlin:kotlin-native-utils:1.8.21=classpath
org.jetbrains.kotlin:kotlin-project-model:1.8.21=classpath
org.jetbrains.kotlin:kotlin-reflect:1.6.21=classpath
org.jetbrains.kotlin:kotlin-scripting-common:1.8.21=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.21=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.21=classpath
org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.21=classpath
org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=classpath
org.jetbrains.kotlin:kotlin-stdlib:1.6.21=classpath
org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=classpath
org.jetbrains.kotlin:kotlin-util-io:1.8.21=classpath
org.jetbrains.kotlin:kotlin-util-klib:1.8.21=classpath
org.jetbrains.kotlin:kotlin-allopen:1.8.22=classpath
org.jetbrains.kotlin:kotlin-android-extensions:1.8.22=classpath
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.22=classpath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.22=classpath
org.jetbrains.kotlin:kotlin-compiler-runner:1.8.22=classpath
org.jetbrains.kotlin:kotlin-daemon-client:1.8.22=classpath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.8.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.8.22=classpath
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.22=classpath
org.jetbrains.kotlin:kotlin-native-utils:1.8.22=classpath
org.jetbrains.kotlin:kotlin-project-model:1.8.22=classpath
org.jetbrains.kotlin:kotlin-reflect:1.8.20=classpath
org.jetbrains.kotlin:kotlin-scripting-common:1.8.22=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.22=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.22=classpath
org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.22=classpath
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=classpath
org.jetbrains.kotlin:kotlin-stdlib:1.8.21=classpath
org.jetbrains.kotlin:kotlin-tooling-core:1.8.22=classpath
org.jetbrains.kotlin:kotlin-util-io:1.8.22=classpath
org.jetbrains.kotlin:kotlin-util-klib:1.8.22=classpath
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
org.jetbrains:annotations:13.0=classpath
org.jooq:jooq-codegen:3.18.4=classpath
Expand All @@ -93,11 +94,11 @@ org.siouan:frontend-gradle-plugin-jdk11:6.0.0=classpath
org.slf4j:slf4j-api:1.7.36=classpath
org.sonarsource.scanner.api:sonar-scanner-api:2.16.2.588=classpath
org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929=classpath
org.springframework.boot:spring-boot-buildpack-platform:3.1.0=classpath
org.springframework.boot:spring-boot-gradle-plugin:3.1.0=classpath
org.springframework.boot:spring-boot-loader-tools:3.1.0=classpath
org.springframework:spring-core:6.0.9=classpath
org.springframework:spring-jcl:6.0.9=classpath
org.springframework.boot:spring-boot-buildpack-platform:3.1.1=classpath
org.springframework.boot:spring-boot-gradle-plugin:3.1.1=classpath
org.springframework.boot:spring-boot-loader-tools:3.1.1=classpath
org.springframework:spring-core:6.0.10=classpath
org.springframework:spring-jcl:6.0.10=classpath
org.tomlj:tomlj:1.0.0=classpath
xmlpull:xmlpull:1.1.3.1=classpath
empty=
3 changes: 1 addition & 2 deletions frontend/src/components/staff/StaffCard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
</figure>
<div class="card-content has-text-left">
<div class="username">
<strong class="is-size-4">{{ member.user.name }}</strong
>#{{ member.user.discriminator }}
<strong class="is-size-4">{{ member.user.name }}</strong>
</div>
<div :class="staffBadgeClass">{{ member.renderStaffFunction() }}</div>
<div v-if="member.slogan !== null" class="is-italic slogan">{{ member.slogan }}</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/staff/staff-store.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const staffStore = {
}

let mappedStaff = staff.map((member) => {
const user = new User(member.discordId, member.name, member.avatarId, member.discriminator);
const user = new User(member.discordId, member.name, member.avatarId);
return new StaffMember(user, member.function, member.slogan, member.link);
});
context.commit(LOAD_STAFF, mappedStaff);
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/user/user-store.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export const userStore = {
if (user) {
context.commit(
LOAD_USER,
new User(user.discordId, user.name, user.avatarId, user.discriminator, user.roles)
new User(user.discordId, user.name, user.avatarId, user.roles)
);
} else {
context.commit(LOAD_FAILED);
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/components/user/user.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@
* Represents a single Discord User.
*/
export class User {
constructor(discordId, name, avatarId, discriminator, roles) {
constructor(discordId, name, avatarId, roles) {
this.discordId = discordId;
this.name = name;
this.avatarId = avatarId;
this.discriminator = discriminator;
this.roles = roles;
}

avatarUrl() {
if (this.avatarId === null || this.avatarId === "") {
let number = this.discriminator % 5;
let number = (this.discordId >> 22) % 6;
return `https://cdn.discordapp.com/embed/avatars/${number}.png`;
}
const ext = this.avatarId.startsWith("a_") ? "gif" : "png";
Expand Down
Loading

0 comments on commit 6694d65

Please sign in to comment.