Skip to content

Commit

Permalink
some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Ovsenka committed Oct 6, 2024
1 parent 3b6006d commit a3a55a6
Show file tree
Hide file tree
Showing 19 changed files with 58 additions and 292 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea/
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/gradle.xml

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/jarRepositories.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/java-project-71.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/kotlinc.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

124 changes: 0 additions & 124 deletions .idea/uiDesigner.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

43 changes: 43 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
run-dist:
app/build/install/app/bin/app

run-dist-help:
app/build/install/app/bin/app -h

run-dist-version:
app/build/install/app/bin/app -V

run-dist-test:
app/build/install/app/bin/app src/test/resources/test1.json src/test/resources/test2.json

run-dist-test-yml:
app/build/install/app/bin/app src/test/resources/test1.yml src/test/resources/test2.yml

clean:
app/gradlew clean

build:
app/gradlew clean build

install:
app/gradlew clean install

run:
app/gradlew run

test:
app/gradlew test

report:
app/gradlew jacocoTestReport

lint:
app/gradlew checkstyleMain

check-deps:
app/gradlew dependencyUpdates -Drevision=release


build-run: build run

.PHONY: build
3 changes: 0 additions & 3 deletions app/.idea/.gitignore

This file was deleted.

17 changes: 0 additions & 17 deletions app/.idea/gradle.xml

This file was deleted.

6 changes: 0 additions & 6 deletions app/.idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions app/.idea/vcs.xml

This file was deleted.

43 changes: 0 additions & 43 deletions app/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ dependencies {
testImplementation(platform("org.junit:junit-bom:5.10.2"))
testImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
implementation("info.picocli:picocli:4.7.6")
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
implementation("com.fasterxml.jackson.core:jackson-databind:2.17.1")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.0-rc1")
}



tasks.withType<Test> {
useJUnitPlatform()
}
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/hexlet/code/Differ.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ public static String generate(String pathToFile, String pathToFile2, String form
formatter = FormatterFactory.getFormatter(format);
return formatter.format(DiffBuilder.build(mapFile, mapFile2));
}

public static String generate(String pathToFile, String pathToFile2) throws Exception {
return generate(pathToFile, pathToFile2, "stylish");
}
}
Loading

0 comments on commit a3a55a6

Please sign in to comment.