From 859e813b194d45ef024ccd20e2e36d4667b3ab12 Mon Sep 17 00:00:00 2001
From: Maksim Litvinov <litvinovmksm@gamil.com>
Date: Tue, 18 Mar 2025 16:08:13 +0300
Subject: [PATCH 1/2] change code climate to codacy

---
 .github/workflows/main.yml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f742914..21168b6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,11 +19,10 @@ jobs:
           gradle-version: 8.7
       - run: ./gradlew checkstyleMain
       - run: ./gradlew test
-      # - name: Publish code coverage
-      #   uses: paambaati/codeclimate-action@v9.0.0
-      #   env:
-      #     CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
-      #     JACOCO_SOURCE_PATH: ${{github.workspace}}/src/main/java
+      - name: Generate coverage report
+        run: make report
+      # - name: Publsish coverage report to codacy
+      #   uses: codacy/codacy-coverage-reporter-action@v1.3.0
       #   with:
-      #     coverageCommand: make report
-      #     coverageLocations: ${{github.workspace}}/build/reports/jacoco/test/jacocoTestReport.xml:jacoco
+      #     project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+      #     coverage-reports: build/reports/jacoco/test/jacocoTestReport.xml

From 3877ead5d22450138941ff0d12010d32964abfb8 Mon Sep 17 00:00:00 2001
From: Maksim Litvinov <litvinovmksm@gamil.com>
Date: Wed, 19 Mar 2025 14:24:22 +0300
Subject: [PATCH 2/2] add sonarqube

---
 .github/workflows/main.yml | 28 ++++++++++++++++++++--------
 build.gradle.kts           | 11 +++++++++++
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 21168b6..cf4286b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,15 +14,27 @@ jobs:
         with:
           java-version: '21'
           distribution: 'temurin'
-      - uses: gradle/gradle-build-action@v3
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 8.7
-      - run: ./gradlew checkstyleMain
-      - run: ./gradlew test
+          fetch-depth: 0
+      - name: Execute Gradle build
+        run: ./gradlew build
       - name: Generate coverage report
         run: make report
-      # - name: Publsish coverage report to codacy
-      #   uses: codacy/codacy-coverage-reporter-action@v1.3.0
+      # - name: Cache SonarQube packages
+      #   uses: actions/cache@v4
       #   with:
-      #     project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-      #     coverage-reports: build/reports/jacoco/test/jacocoTestReport.xml
+      #     path: ~/.sonar/cache
+      #     key: ${{ runner.os }}-sonar
+      #     restore-keys: ${{ runner.os }}-sonar
+      # - name: Cache Gradle packages
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: ~/.gradle/caches
+      #     key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+      #     restore-keys: ${{ runner.os }}-gradle
+      # - name: Build and analyze
+      #   env:
+      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      #   run: ./gradlew sonar --info
diff --git a/build.gradle.kts b/build.gradle.kts
index 10587fc..4f45c8d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,6 +8,8 @@ plugins {
     id("io.freefair.lombok") version "8.6"
     id("com.github.ben-manes.versions") version "0.50.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
+    // Плагин для публикации отчета о покрытии тестами на SonarQube
+    id("org.sonarqube") version "6.0.1.5171"
 }
 
 group = "io.hexlet"
@@ -38,3 +40,12 @@ tasks.test {
 }
 
 tasks.jacocoTestReport { reports { xml.required.set(true) } }
+
+// Конфигурация плагина org.sonarqube
+sonar {
+    properties {
+        property("sonar.projectKey", "hexlet_java-package")
+        property("sonar.organization", "hexlet")
+        property("sonar.host.url", "https://sonarcloud.io")
+    }
+}