Merge pull request #5 from VictorGotsenko/Step06fixBuildError

Made makefiles

Author: VictorGotsenko

.github/workflows/DifferenceCalculator.yml

@@ -23,22 +23,15 @@ jobs:
       uses: gradle/actions/setup-gradle@v4
       with:
           gradle-version: 8.7
-
-    - uses: austenstone/job-summary@v2.0
-      id: job-summary
-      with:
-        create-pdf: false
-    - run: echo "${{ steps.job-summary.outputs.job-summary }}"
-
 
     - name: Build with Gradle Wrapper
       run: make build
 
     - name: Checking style with Gradle
       run: make lint
 
-    #- name: Testing with Gradle
-    #  run: make test
+    - name: Testing with Gradle
+      run: make test
 
     - name: Publish code coverage
       uses: paambaati/codeclimate-action@v5.0.0

.gitignore

@@ -0,0 +1,26 @@
+# Ignore Gradle hiden dir
+.gradle
+
+# Ignore Gradle build output directory
+build
+
+# Ignore Logs output directory
+**/logs/
+
+# Ignore IntelliJ IDEA directory  
+.idea/
+
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+#checkstyle/checkstyle.xml
+config/

Makefile

@@ -3,5 +3,17 @@ run-dist:
 
 build:
 	make -C app build
+	
+clean:
+	make -C app clean
+	
+test:
+	make -C app test
+	
+report:
+	make -C app report
+	
+lint:
+	make -C app lint		
 
 .PHONY: build

app/Makefile

@@ -1,6 +1,18 @@
 run-dist:
 	./build/install/app/bin/app -h
-
 run-dist-json:
 	./build/install/app/bin/app src/test/resources/file1.json src/test/resources/file2.json
+clean:
+	./gradlew clean
+build:
+	./gradlew build
+install:
+	./gradlew clean install
+test:
+	./gradlew test
+report:
+	./gradlew jacocoTestReport
+lint:
+	./gradlew checkstyleMain
+.PHONY: build
 

app/build.gradle.kts

@@ -1,10 +1,14 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.api.tasks.testing.logging.TestLogEvent
+
 plugins {
     id("java")
     id("application")
     id("se.patrikerdes.use-latest-versions") version "0.2.18"
-    id("com.github.ben-manes.versions") version "0.41.0"
+    id("com.github.ben-manes.versions") version "0.50.0"
     id("checkstyle")
     id("jacoco")
+    id("com.adarshr.test-logger") version "4.0.0"
 }
 
 group = "hexlet.code"
@@ -26,6 +30,7 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind:2.17.2")
     implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.2")
     implementation("com.fasterxml.jackson.core:jackson-core:2.17.2")
+    testImplementation("org.assertj:assertj-core:3.25.3")
 }
 
 tasks.test {

app/file1.json

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME