Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated dependencies #57

Merged
merged 4 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ imported to anki
### Stack

* Java 17
* Spring boot 3.12
* Spring boot 3.2.2
* Spring shell
* Spring boot jdbc
* Caffeine cache
Expand Down
12 changes: 8 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.1.3'
id 'io.spring.dependency-management' version '1.1.3'
id 'org.springframework.boot' version '3.2.2'
id 'io.spring.dependency-management' version '1.1.4'
}

group = 'ru.dankoy'
Expand Down Expand Up @@ -30,9 +30,13 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
implementation 'org.springframework.shell:spring-shell-starter'

implementation 'ch.qos.logback:logback-classic:1.4.11'
implementation 'ch.qos.logback:logback-classic'
implementation 'ch.qos.logback:logback-core'

implementation 'org.xerial:sqlite-jdbc'
// sqlite with default version from spring boot bom (3.42.1) doesn't work with spring boot 3.2.2
// sqlite version 3.42.1 works with spring boot 3.1.3
// Working sqlite version with spring boot 3.2.2 is 3.45.1.0
implementation 'org.xerial:sqlite-jdbc:3.45.1.0'
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.squareup.okhttp3:okhttp'
implementation 'com.squareup.okhttp3:logging-interceptor'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import ru.dankoy.korvotoanki.core.exceptions.KorvoRootException;


@SpringBootTest
@Import(value = TemplateBuilderConfig.class)
@SpringBootTest(classes = {TemplateBuilder.class, TemplateBuilderConfig.class})
//@Import(value = TemplateBuilderConfig.class)
@DisplayName("Test TemplateBuilderImpl ")
class TemplateBuilderImplTest {

Expand Down Expand Up @@ -68,7 +68,7 @@ void writeTemplateMeaning() throws IOException, URISyntaxException {

var path = Paths.get(
getClass().getResource("/templates/correct/correct-meaning.ftl").toURI());
var correct = String.join("\n", Files.readAllLines(path));
var correct = String.join(System.lineSeparator(), Files.readAllLines(path));

Map<String, Object> templateData = new HashMap<>();
templateData.put("ankiData", ankiData);
Expand All @@ -93,7 +93,7 @@ void writeTemplateAnkiExport() throws IOException, URISyntaxException {

var path = Paths.get(
getClass().getResource("/templates/correct/correct-korvo-to-anki-correct.ftl").toURI());
var correct = String.join("\n", Files.readAllLines(path));
var correct = String.join(System.lineSeparator(), Files.readAllLines(path));

Map<String, Object> templateData = new HashMap<>();
templateData.put("ankiDataList", Collections.singletonList(ankiData));
Expand Down
Loading