Merge pull request #8 from MineInAbyss/develop

Build against 1.20, cleanup workflows

Author: 0ffz

.github/workflows/gradle-ci.yml

@@ -1,11 +1,6 @@
 name: Java CI with Gradle
 
 on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '**.md'
   pull_request:
 
 concurrency:

.github/workflows/publish-packages.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - develop
     paths-ignore:
       - '**.md'
 
@@ -14,44 +15,27 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - uses: MineInAbyss/publish-action@master
         with:
-          distribution: temurin
-          java-version: 17
-          cache: gradle
-
-      - name: Set env variable from latest maven version
-        run: >
-          echo "RELEASE_VERSION=$( \
-            curl https://repo.mineinabyss.com/releases/com/mineinabyss/guiy-compose/maven-metadata.xml | \
-            grep -oP '(?!<latest>)[\d\.]*(?=</latest>)' \
-          )" >> $GITHUB_ENV
-
-      - name: Run gradle build and publish
-        run: >
-          gradle build publish
-          -PmineinabyssMavenUsername=${{ secrets.MAVEN_PUBLISH_USERNAME }} -PmineinabyssMavenPassword=${{ secrets.MAVEN_PUBLISH_PASSWORD }}
-
-#      - name: Publish documentation to GitHub Pages
-#        uses: peaceiris/actions-gh-pages@v3
-#        with:
-#          github_token: ${{ secrets.GITHUB_TOKEN }}
-#          publish_dir: ./build/dokka/htmlMultiModule
-#          force_orphan: true
-
-      - name: Get version from gradle
-        shell: bash
-        id: extract_version
-        run: |
-          version=`gradle properties --console=plain -q | grep "^version:" | awk '{printf $2}'`
-          echo "::set-output name=version::$version"
-
-      - name: Create GitHub Release
-        uses: marvinpinto/action-automatic-releases@latest
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
-          automatic_release_tag: v${{ steps.extract_version.outputs.version }}
-          files: |
-            build/libs/*[0-9].jar
+          maven-metadata-url: https://repo.mineinabyss.com/releases/com/mineinabyss/guiy-compose/maven-metadata.xml
+#          pages-path: build/dokka/htmlMultiModule/
+#          dokka: dokkaHtmlMultiModule
+          maven-username: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
+          maven-password: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
+          release-files: |
+            ${{ github.workspace }}/publish/*.jar
+
+  deploy:
+    permissions:
+      pages: write
+      id-token: write
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    if: ${{ github.ref == 'refs/heads/master' }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

build.gradle.kts

@@ -3,16 +3,14 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 val idofrontVersion: String by project
 
 plugins {
-    kotlin("jvm")
-    id("com.mineinabyss.conventions.kotlin")
+    alias(libs.plugins.mia.kotlin.jvm)
     id("com.mineinabyss.conventions.papermc")
     id("com.mineinabyss.conventions.nms")
     id("com.mineinabyss.conventions.autoversion")
     id("com.mineinabyss.conventions.publication")
     id("com.mineinabyss.conventions.testing")
     id("com.mineinabyss.conventions.copyjar")
-    id("org.jetbrains.compose")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    alias(libs.plugins.compose)
 }
 
 tasks.withType<KotlinCompile> {

gradle.properties

@@ -1,7 +1,4 @@
 kotlin.code.style=official
 group=com.mineinabyss
-version=0.8
-kotlinVersion=1.7.10
-composeVersion=1.2.0
-serverVersion=1.19.2-R0.1-SNAPSHOT
-idofrontVersion=0.14.7
+version=0.9
+idofrontVersion=0.18.14

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

guiy-example/build.gradle.kts

@@ -1,7 +1,7 @@
 val idofrontVersion: String by project
 
 plugins {
-    id("com.mineinabyss.conventions.kotlin")
+    alias(libs.plugins.mia.kotlin.jvm)
     id("com.mineinabyss.conventions.papermc")
     id("com.mineinabyss.conventions.copyjar")
     id("org.jetbrains.compose")

settings.gradle.kts

@@ -7,13 +7,6 @@ pluginManagement {
         maven("https://repo.papermc.io/repository/maven-public/")
     }
 
-    plugins {
-        val kotlinVersion: String by settings
-        val composeVersion: String by settings
-        kotlin("jvm") version kotlinVersion
-        id("org.jetbrains.compose") version composeVersion
-    }
-
     val idofrontVersion: String by settings
 
     resolutionStrategy {