Merge pull request #19 from Astra-Interactive/update-libs

Update libraries

.github/dependabot.yaml

@@ -0,0 +1,23 @@
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    rebase-strategy: "disabled"
+    groups:
+      versions:
+        dependency-type: production
+        applies-to: version-updates
+    open-pull-requests-limit: 1
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    groups:
+      versions:
+        dependency-type: production
+        applies-to: version-updates
+    rebase-strategy: "disabled"
+    open-pull-requests-limit: 1

.github/workflows/build-project.yml → .github/workflows/call-build-project.yml

@@ -7,15 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Git repo
-        uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
       - name: Give gradle permission
         run: chmod +x gradlew
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: build --stacktrace

.github/workflows/create-artifacts.yml → .github/workflows/call-create-artifacts.yml

@@ -10,31 +10,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Git repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - uses: christian-draeger/read-properties@1.1.1
         id: properties
         with:
           path: './gradle.properties'
           properties: 'makeevrserg.project.name makeevrserg.project.version.string'
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 21
       - name: Give gradle permission
         run: chmod +x gradlew
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
-          arguments: shadowJar --stacktrace
+          arguments: :plugin:shadowJar --stacktrace
       - name: Create release
         id: create_internal_release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
         with:
           files: |
-            ./jars/${{ steps.properties.outputs.makeevrserg-project-name }}-${{ steps.properties.outputs.makeevrserg-project-version-string }}.jar
+            ./jars/*.jar
           tag_name: ${{ steps.properties.outputs.makeevrserg-project-version-string }}
           name: ${{ steps.properties.outputs.makeevrserg-project-name }} - ${{ steps.properties.outputs.makeevrserg-project-version-string }}
           draft: false

.github/workflows/detekt-validation.yml → .github/workflows/call-detekt-validation.yml

@@ -6,15 +6,15 @@ jobs:
     name: "Check project by detekt"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 1.17
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
       - name: Give gradle permission
         run: chmod +x gradlew
       - name: detekt
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: detekt

.github/workflows/gradle-wrapper-validation.yml → .github/workflows/call-gradle-wrapper-validation.yml

@@ -7,6 +7,6 @@ jobs:
     name: "Gradle Wrapper Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v3

.github/workflows/tests-validation.yml → .github/workflows/call-tests-validation.yml

@@ -7,15 +7,15 @@ jobs:
     name: "Run tests"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
       - name: Give gradle permission
         run: chmod +x gradlew
       - name: Run tests
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: cleanTest test

.github/workflows/check-develop.yml

@@ -1,23 +1,20 @@
 name: Check Develop
 on:
-  pull_request:
-    branches:
-      - *
   push:
     branches:
       - develop
 jobs:
   gradle_validation:
     name: Validate gradle wrapper
-    uses: ./.github/workflows/gradle-wrapper-validation.yml
+    uses: ./.github/workflows/call-gradle-wrapper-validation.yml
   detekt_validation:
     name: Check by detekt
     needs: gradle_validation
-    uses: ./.github/workflows/detekt-validation.yml
+    uses: ./.github/workflows/call-detekt-validation.yml
   tests_validation:
     needs: gradle_validation
-    uses: ./.github/workflows/tests-validation.yml
+    uses: ./.github/workflows/call-tests-validation.yml
   build:
     name: Build project
-    needs: [ gradle_validation, detekt_validation ]
-    uses: ./.github/workflows/build-project.yml
+    needs: [ gradle_validation, detekt_validation,tests_validation ]
+    uses: ./.github/workflows/call-build-project.yml

.github/workflows/pr.yml

@@ -0,0 +1,35 @@
+name: Check Develop
+on:
+  pull_request:
+    branches:
+      - 'develop'
+      - 'master'
+
+# Concurrency strategy:
+#   github.workflow: distinguish this workflow from others
+#   github.event_name: distinguish `push` event from `pull_request` event
+#   github.ref_name: distinguish branch
+#   github.repository: distinguish owner+repository
+#
+# Reference:
+#   https://docs.github.com/en/actions/using-jobs/using-concurrency
+#   https://docs.github.com/en/actions/learn-github-actions/contexts#github-context
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name }}-${{github.ref_name}}-${{github.repository}}
+  cancel-in-progress: true
+
+jobs:
+  gradle_validation:
+    name: Validate gradle wrapper
+    uses: ./.github/workflows/call-gradle-wrapper-validation.yml
+  detekt_validation:
+    name: Check by detekt
+    needs: gradle_validation
+    uses: ./.github/workflows/call-detekt-validation.yml
+  tests_validation:
+    needs: gradle_validation
+    uses: ./.github/workflows/call-tests-validation.yml
+  build:
+    name: Build project
+    needs: [ gradle_validation, detekt_validation, tests_validation ]
+    uses: ./.github/workflows/call-build-project.yml

.github/workflows/build-master.yml → .github/workflows/release-master.yml

@@ -5,15 +5,15 @@ on:
       - master
 jobs:
   gradle_validation:
-    uses: ./.github/workflows/gradle-wrapper-validation.yml
+    uses: ./.github/workflows/call-gradle-wrapper-validation.yml
   detekt_validation:
     needs: gradle_validation
-    uses: ./.github/workflows/detekt-validation.yml
+    uses: ./.github/workflows/call-detekt-validation.yml
   tests_validation:
     needs: gradle_validation
-    uses: ./.github/workflows/tests-validation.yml
+    uses: ./.github/workflows/call-tests-validation.yml
   create_artifact:
     needs: [ gradle_validation, detekt_validation, tests_validation ]
-    uses: ./.github/workflows/create-artifacts.yml
+    uses: ./.github/workflows/call-create-artifacts.yml
     secrets:
       ACTIONS_TOKEN: ${{ secrets.ACTIONS_TOKEN }}

build.gradle.kts

@@ -1,28 +1,21 @@
-buildscript {
-    dependencies {
-        classpath("ru.astrainteractive.gradleplugin:convention:0.0.10")
-        classpath("ru.astrainteractive.gradleplugin:minecraft:0.0.10")
-    }
-}
-
 plugins {
     java
     `java-library`
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.serialization) apply false
 
     // klibs - core
-    alias(klibs.plugins.klibs.gradle.detekt) apply false
-    alias(klibs.plugins.klibs.gradle.detekt.compose) apply false
-    alias(klibs.plugins.klibs.gradle.dokka.root) apply false
-    alias(klibs.plugins.klibs.gradle.dokka.module) apply false
-    alias(klibs.plugins.klibs.gradle.java.core) apply false
-    alias(klibs.plugins.klibs.gradle.stub.javadoc) apply false
-    alias(klibs.plugins.klibs.gradle.publication) apply false
-    alias(klibs.plugins.klibs.gradle.rootinfo) apply false
+    alias(libs.plugins.klibs.gradle.detekt) apply false
+    alias(libs.plugins.klibs.gradle.detekt.compose) apply false
+    alias(libs.plugins.klibs.gradle.dokka.root) apply false
+    alias(libs.plugins.klibs.gradle.dokka.module) apply false
+    alias(libs.plugins.klibs.gradle.java.core) apply false
+    alias(libs.plugins.klibs.gradle.stub.javadoc) apply false
+    alias(libs.plugins.klibs.gradle.publication) apply false
+    alias(libs.plugins.klibs.gradle.rootinfo) apply false
     // klibs - minecraft
-    alias(klibs.plugins.klibs.gradle.minecraft.empty) apply false
-    alias(klibs.plugins.klibs.gradle.minecraft.multiplatform) apply false
+    alias(libs.plugins.klibs.gradle.minecraft.empty) apply false
+    alias(libs.plugins.klibs.gradle.minecraft.multiplatform) apply false
 }
 
 apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")

gradle.properties

@@ -1,12 +1,12 @@
 kotlin.code.style=official
 # Java
 makeevrserg.java.source=8
-makeevrserg.java.target=17
-makeevrserg.java.ktarget=17
+makeevrserg.java.target=21
+makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraRating
 makeevrserg.project.group=ru.astrainteractive.astrarating
-makeevrserg.project.version.string=1.14.0
+makeevrserg.project.version.string=1.15.0-unstable
 makeevrserg.project.description=Rating plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru