Setup

kora-projects · Sep 23, 2024 · 3a0921f · 3a0921f
1 parent 672e640
commit 3a0921f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/.github/workflows/test-master.yml b/.github/workflows/test-master.yml
@@ -14,11 +14,13 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: "21"
+          java-version: "17"
           distribution: "adopt"
 
       - name: Build classes
-        run: "./gradlew classes"
+        run: |
+          ./gradlew classes || true
+          ./gradlew classes
 
       - name: Build tests
         run: "./gradlew testClasses"

diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml
@@ -21,11 +21,13 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: "21"
+          java-version: "17"
           distribution: "adopt"
 
       - name: Build classes
-        run: "./gradlew classes"
+        run: |
+          ./gradlew classes || true
+          ./gradlew classes
 
       - name: Build tests
         run: "./gradlew testClasses"

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-[![GitHub Action](https://github.com/kora-projects/kora-java-crud-template/workflows/Build%20Master/badge.svg)](https://github.com/kora-projects/kora-java-crud-template/actions?query=workflow%3A%22Build%20Master%22++)
+[![GitHub Action](https://github.com/kora-projects/kora-kotlin-crud-template/workflows/Build%20Master/badge.svg)](https://github.com/kora-projects/kora-kotlin-crud-template/actions?query=workflow%3A%22Build%20Master%22++)
 
-# Шаблон приложения Kora Java CRUD
+# Шаблон приложения Kora Kotlin CRUD
 
-Пример сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API, 
+Пример Kotlin сервиса реализованного на Kora с HTTP [CRUD](https://github.com/swagger-api/swagger-petstore) API, 
 в качестве базы данных выступает Postgres, используется кэш Caffeine, а также другие модули которые использовались бы в реальном приложении в бою.
 
 В примере использовались модули:
@@ -18,6 +18,12 @@
 
 ## Build
 
+Собрать классы (может потребоваться запустить 2 раза из-за APT):
+
+```shell
+./gradlew classes
+```
+
 Собрать артефакт:
 
 ```shell

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,8 +11,10 @@ buildscript {
 plugins {
     id("org.openapi.generator") version ("7.4.0")
     id("application")
+    id("jacoco")
     kotlin("kapt") version ("1.9.10")
     kotlin("jvm") version ("1.9.10")
+    id("org.flywaydb.flyway") version ("8.4.2")
     id("com.google.devtools.ksp") version ("1.9.10-1.0.13")
 }
 
@@ -116,6 +118,13 @@ tasks.withType<JavaExec> {
     )
 }
 
+flyway {
+    url = "jdbc:postgresql://$postgresHost:$postgresPort/$postgresDatabase"
+    user = postgresUser
+    password = postgresPassword
+    locations = arrayOf("classpath:db/migration")
+}
+
 tasks.distTar {
     archiveFileName.set("application.tar")
 }
@@ -131,3 +140,10 @@ tasks.test {
         junitXml.required = false
     }
 }
+
+tasks.jacocoTestReport {
+    reports {
+        xml.required = true
+        html.outputLocation = layout.buildDirectory.dir("jacocoHtml")
+    }
+}