From 6df12019afd56e27772c7012cfa69539e9e5d96f Mon Sep 17 00:00:00 2001 From: "stepan.moc" Date: Mon, 1 Apr 2024 17:50:46 +0200 Subject: [PATCH 1/2] changed backend --- .idea/.gitignore | 10 ++++++++++ .idea/STIN-semestral-project.iml | 11 +++++++++++ .idea/jpa-buddy.xml | 6 ++++++ .idea/misc.xml | 9 +++++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ backend/build.gradle.kts | 4 ++-- .../backend/weather/controller/WeatherController.kt | 4 ++-- .../com/tul/backend/weather/dto/ActualWeatherDTO.kt | 2 +- .../com/tul/backend/weather/service/WeatherService.kt | 2 +- 10 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/STIN-semestral-project.iml create mode 100644 .idea/jpa-buddy.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..a9d7db9 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml +# GitHub Copilot persisted chat sessions +/copilot/chatSessions diff --git a/.idea/STIN-semestral-project.iml b/.idea/STIN-semestral-project.iml new file mode 100644 index 0000000..dc88000 --- /dev/null +++ b/.idea/STIN-semestral-project.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml new file mode 100644 index 0000000..966d5f5 --- /dev/null +++ b/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d79bd4e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..6369c49 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts index b741068..fc35ec1 100644 --- a/backend/build.gradle.kts +++ b/backend/build.gradle.kts @@ -15,7 +15,7 @@ group = "com.tul" version = "0.0.1-SNAPSHOT" java { - sourceCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_17 } repositories { @@ -43,7 +43,7 @@ dependencies { tasks.withType { kotlinOptions { freeCompilerArgs += "-Xjsr305=strict" - jvmTarget = "21" + jvmTarget = "17" } } diff --git a/backend/src/main/kotlin/com/tul/backend/weather/controller/WeatherController.kt b/backend/src/main/kotlin/com/tul/backend/weather/controller/WeatherController.kt index 2459bd4..4053c86 100644 --- a/backend/src/main/kotlin/com/tul/backend/weather/controller/WeatherController.kt +++ b/backend/src/main/kotlin/com/tul/backend/weather/controller/WeatherController.kt @@ -1,6 +1,6 @@ -package com.tul.stin.weather.controller +package com.tul.backend.weather.controller -import com.tul.stin.weather.service.WeatherService +import com.tul.backend.weather.service.WeatherService import org.springframework.http.HttpStatus import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.RequestMapping diff --git a/backend/src/main/kotlin/com/tul/backend/weather/dto/ActualWeatherDTO.kt b/backend/src/main/kotlin/com/tul/backend/weather/dto/ActualWeatherDTO.kt index 2cf83ae..8d21127 100644 --- a/backend/src/main/kotlin/com/tul/backend/weather/dto/ActualWeatherDTO.kt +++ b/backend/src/main/kotlin/com/tul/backend/weather/dto/ActualWeatherDTO.kt @@ -1,4 +1,4 @@ -package com.tul.stin.weather.dto +package com.tul.backend.weather.dto import java.time.LocalDateTime diff --git a/backend/src/main/kotlin/com/tul/backend/weather/service/WeatherService.kt b/backend/src/main/kotlin/com/tul/backend/weather/service/WeatherService.kt index 8dcf4e3..4721693 100644 --- a/backend/src/main/kotlin/com/tul/backend/weather/service/WeatherService.kt +++ b/backend/src/main/kotlin/com/tul/backend/weather/service/WeatherService.kt @@ -1,4 +1,4 @@ -package com.tul.stin.weather.service +package com.tul.backend.weather.service import org.springframework.stereotype.Service From af48c168c450c7a75271600b591777e14c9656a3 Mon Sep 17 00:00:00 2001 From: StepanMoc Date: Mon, 1 Apr 2024 17:53:27 +0200 Subject: [PATCH 2/2] add gitignore --- .gitignore | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5a979af --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Kotlin ### +.kotlin