Skip to content

Commit

Permalink
Update several dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
NovaFox161 committed Aug 19, 2023
1 parent cac34ee commit bbc0934
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 26 deletions.
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ allprojects {
//Plugins
apply(plugin = "java")
apply(plugin = "kotlin")
apply(plugin = "io.spring.dependency-management")

//Compiler nonsense
java.sourceCompatibility = JavaVersion.VERSION_17
Expand Down Expand Up @@ -66,15 +67,13 @@ allprojects {
// Various libs
val okhttpVersion: String by properties
val copyDownVersion: String by properties
val jsoupVersion: String by properties

repositories {
mavenCentral()
mavenLocal()

maven {
url = uri("https://repo.maven.apache.org/maven2/")
}

maven("https://repo.maven.apache.org/maven2/")
maven("https://kotlin.bintray.com/kotlinx")
maven("https://oss.sonatype.org/content/repositories/snapshots")
maven("https://repo.spring.io/milestone")
Expand Down Expand Up @@ -122,6 +121,7 @@ allprojects {
// Various Libs
implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
implementation("io.github.furstenheim:copy_down:$copyDownVersion")
implementation("org.jsoup:jsoup:$jsoupVersion")
}

kotlin {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import io.github.furstenheim.OptionsBuilder
import kotlinx.serialization.json.Json
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import org.jsoup.safety.Whitelist
import org.jsoup.safety.Safelist
import org.slf4j.Marker
import org.slf4j.MarkerFactory

Expand Down Expand Up @@ -45,9 +45,9 @@ object GlobalVal {
ignoreUnknownKeys = true
}

val HTML_WHITELIST: Whitelist
val HTML_WHITELIST: Safelist
get() {
return Whitelist.basic()
return Safelist.basic()
.preserveRelativeLinks(false)
.removeAttributes("sub", "sup", "small")
}
Expand Down
26 changes: 13 additions & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,39 @@ gitPropertiesVersion=2.4.1
kotlinPoetVersion=1.14.2

# Tools
kotlinxCoroutinesReactorVersion=1.6.4
reactorKotlinExtensions=1.1.7
kotlinxCoroutinesReactorVersion=1.7.3
reactorKotlinExtensions=1.2.2

# Discord
discord4jVersion=3.2.5
discord4jStoresVersion=3.2.2
discordWebhookVersion=0.8.2
discordWebhookVersion=0.8.4

# Spring
springVersion=3.1.2

# Thymeleaf
thymeleafVersion=3.1.0.M2
thymeleafLayoutDialectVersion=3.1.0
thymeleafVersion=3.1.2.RELEASE

# Database
flywayVersion=9.3.0
mikuR2dbcMySqlVersion=0.8.2.RELEASE
mySqlConnectorJava=8.0.30
mySqlConnectorJava=8.0.33

# Serialization
kotlinxSerializationJsonVersion=1.4.0
jacksonVersion=2.13.4
jsonVersion=20220320
kotlinxSerializationJsonVersion=1.5.1
jacksonVersion=2.15.2
jsonVersion=20230618

# Google libs
googleApiClientVersion=2.0.0
googleServicesCalendarVersion=v3-rev20220715-2.0.0
googleApiClientVersion=2.2.0
googleServicesCalendarVersion=v3-rev411-1.25.0
googleOauthClientVersion=1.34.1

# Various Libs
okhttpVersion=4.10.0
copyDownVersion=1.0
okhttpVersion=4.11.0
copyDownVersion=1.1
jsoupVersion=1.16.1

# Jib properties
baseImage=eclipse-temurin:17-jdk-alpine
10 changes: 4 additions & 6 deletions web/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,26 @@ plugins {
// Spring
kotlin("plugin.spring")
id("org.springframework.boot")
id("io.spring.dependency-management")
//id("io.spring.dependency-management")

// Tooling
id("com.google.cloud.tools.jib")
}

// Versions -- found in gradle.properties
val springVersion: String by properties
// Thymeleaf
val thymeleafVersion: String by properties
val thymeleafLayoutDialectVersion: String by properties

dependencies {
api(project(":core"))

// Spring
implementation("org.springframework.boot:spring-boot-starter-thymeleaf:$springVersion")
implementation("org.springframework.boot:spring-boot-starter-thymeleaf")

//Thymeleaf
implementation("org.thymeleaf:thymeleaf:$thymeleafVersion")
implementation("org.thymeleaf:thymeleaf")
implementation("org.thymeleaf:thymeleaf-spring5:$thymeleafVersion")
implementation("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:$thymeleafLayoutDialectVersion")
implementation("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect")
}

kotlin {
Expand Down

0 comments on commit bbc0934

Please sign in to comment.