Skip to content

Commit

Permalink
Modernize project
Browse files Browse the repository at this point in the history
  • Loading branch information
rubengees committed Jan 25, 2024
1 parent 77ad96e commit f984b81
Show file tree
Hide file tree
Showing 9 changed files with 202 additions and 274 deletions.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[{*.kt,*.kts}]
ktlint_code_style = intellij_idea
ij_kotlin_allow_trailing_comma = true
ij_kotlin_allow_trailing_comma_on_call_site = true
19 changes: 7 additions & 12 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,16 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup JDK 17
uses: actions/setup-java@v2
- name: Setup JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
distribution: temurin

- name: Setup Gradle cache
uses: actions/cache@v2
with:
path: ~/.gradle
key: ${{ runner.os }}-17-gradle-${{ hashFiles('build.gradle') }}
restore-keys: |
${{ runner.os }}-17-gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2

- name: Check
run: ./gradlew check
Expand All @@ -39,7 +34,7 @@ jobs:
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

- name: Upload Gradle reports
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: Gradle Reports
Expand Down
23 changes: 9 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,27 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 17 ]
java: [ 17, 21 ]

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup JDK
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
distribution: temurin

- name: Setup Gradle cache
uses: actions/cache@v2
with:
path: ~/.gradle
key: ${{ runner.os }}-${{ matrix.java }}-gradle-${{ hashFiles('build.gradle') }}
restore-keys: |
${{ runner.os }}-${{ matrix.java }}-gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2

- name: Check
run: ./gradlew check

- name: Upload Gradle reports
uses: actions/upload-artifact@v2
- name: Upload Gradle reports ${{ matrix.java }}
uses: actions/upload-artifact@v4
if: failure()
with:
name: Gradle Reports ${{ matrix.java }}
name: Gradle Reports
path: "**/build/reports"
File renamed without changes.
240 changes: 0 additions & 240 deletions build.gradle

This file was deleted.

Loading

0 comments on commit f984b81

Please sign in to comment.