From bdc89dd7632048ba07832b7844241cfb45ef7658 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sun, 12 May 2024 12:50:27 +0200 Subject: [PATCH] Add prefix to published version --- .github/workflows/main.yml | 4 ++-- .github/workflows/publish.yml | 4 ++-- mcstructs.py | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b545fdb..cd56c9c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,7 @@ jobs: - name: Setup Python if: steps.check_changes.outputs.changes == 'y' - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 - name: Update and patch mcstructs if: steps.check_changes.outputs.changes == 'y' @@ -36,7 +36,7 @@ jobs: - name: Setup Java JDK if: steps.check_changes.outputs.changes == 'y' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 8b906fe..62635a9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,7 @@ jobs: run: git submodule update --init - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 - name: Update and patch mcstructs run: | @@ -24,7 +24,7 @@ jobs: python mcstructs.py - name: Setup Java JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/mcstructs.py b/mcstructs.py index ea4fd8f..759a08d 100644 --- a/mcstructs.py +++ b/mcstructs.py @@ -2,7 +2,8 @@ import os import re import subprocess -via_nbt_version = '5.0.0' +via_nbt_version = '5.0.0-SNAPSHOT' +version_prefix = '5' # All of this would work better with bytecode rewriting, but here we go replacements = { @@ -11,6 +12,7 @@ replacements = { 'url = "https://maven.lenni0451.net/everything"': 'url = "https://repo.viaversion.com/"', 'api project(":MCStructs-nbt")': f'api "com.viaversion:nbt:{via_nbt_version}"', 'maven_group=net.lenni0451.mcstructs': 'maven_group=com.viaversion.mcstructs', + 'maven_version=': f'maven_version={version_prefix}-', # Code changes 'import net.lenni0451.mcstructs.nbt.tags.': 'import com.viaversion.nbt.tag.', 'import net.lenni0451.mcstructs.nbt.': 'import com.viaversion.nbt.tag.',