Skip to content

Commit

Permalink
Merge pull request #55 from Ingo-FP-Angel/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
Ingo-FP-Angel authored Nov 12, 2023
2 parents d531912 + e07502c commit 41d1c2d
Show file tree
Hide file tree
Showing 5 changed files with 1,448 additions and 990 deletions.
30 changes: 15 additions & 15 deletions backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ import org.apache.tools.ant.filters.ReplaceTokens
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.nio.charset.StandardCharsets

val kotlin_version = "1.7.10"
val ktor_version = "2.1.0"
val kotlinVersion = "1.9.20"
val ktorVersion = "2.1.0"

plugins {
id("idea")
id("java")
id("org.springframework.boot") version "2.7.3"
id("io.spring.dependency-management") version "1.0.13.RELEASE"
kotlin("jvm") version "1.7.10"
kotlin("plugin.spring") version "1.7.10"
id("org.springframework.boot") version "2.7.17"
id("io.spring.dependency-management") version "1.1.3"
kotlin("jvm") version "1.9.20"
kotlin("plugin.spring") version "1.9.20"
}

val appName = "merkliste_20"
Expand All @@ -26,17 +26,17 @@ repositories {
dependencies {
implementation(group = "org.springframework.boot", name = "spring-boot-starter-web")
implementation(group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin")
implementation(group = "org.jetbrains.kotlin", name = "kotlin-reflect", version = kotlin_version)
implementation(group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version = kotlin_version)
implementation(group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.6.4")
implementation(group = "io.ktor", name = "ktor-client-core", version = ktor_version)
implementation(group = "io.ktor", name = "ktor-client-cio", version = ktor_version)
implementation(group = "org.jsoup", name = "jsoup", version = "1.15.3")

testImplementation(group ="com.github.tomakehurst", name = "wiremock-jre8", version = "2.33.2")
implementation(group = "org.jetbrains.kotlin", name = "kotlin-reflect", version = kotlinVersion)
implementation(group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version = kotlinVersion)
implementation(group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3")
implementation(group = "io.ktor", name = "ktor-client-core", version = ktorVersion)
implementation(group = "io.ktor", name = "ktor-client-cio", version = ktorVersion)
implementation(group = "org.jsoup", name = "jsoup", version = "1.16.2")

testImplementation(group ="org.wiremock", name = "wiremock-standalone", version = "3.3.1")
testImplementation(group = "org.assertj", name = "assertj-core")
testImplementation(group ="org.springframework.boot", name = "spring-boot-starter-test")
testImplementation(group ="org.mockito.kotlin", name = "mockito-kotlin", version = "4.0.0")
testImplementation(group ="org.mockito.kotlin", name = "mockito-kotlin", version = "5.1.0")
}

tasks.withType<Test> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class WebClient(merklisteProperties: MerklisteProperties) {
private val logger = LoggerFactory.getLogger(javaClass)
private val baseUrl: String = merklisteProperties.baseUrl
private val client: HttpClient = HttpClient(CIO) {
expectSuccess = true
engine {
requestTimeout = 30_000
}
Expand Down
34 changes: 17 additions & 17 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.10.4",
"@fontsource/roboto": "^4.5.8",
"@mui/material": "^5.10.3",
"axios": "^0.27.2",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.8",
"@mui/material": "^5.14.17",
"axios": "^1.6.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"web-vitals": "^3.0.1"
"web-vitals": "^3.5.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^29.0.0",
"@types/node": "^18.7.14",
"@types/react": "^18.0.18",
"@types/react-dom": "^18.0.6",
"@vitejs/plugin-react": "^2.0.1",
"typescript": "^4.8.2",
"vite": "^4.3.9",
"vite-plugin-svgr": "^2.2.1"
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/react": "^14.1.0",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.8",
"@types/node": "^20.9.0",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@vitejs/plugin-react": "^4.1.1",
"typescript": "^5.2.2",
"vite": "^4.5.0",
"vite-plugin-svgr": "^4.1.0"
},
"scripts": {
"start": "vite",
Expand Down
Loading

0 comments on commit 41d1c2d

Please sign in to comment.