diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6da165..dc8f212 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,23 @@ jobs: with: distribution: temurin java-version: 21 + - name: Read pnLibrary version + id: pnlibrary + run: echo "version=$(grep -m1 "^def pnLibraryVersion" build.gradle | cut -d"'" -f2)" >> "$GITHUB_OUTPUT" + + - name: Checkout pnLibrary + uses: actions/checkout@v4 + with: + repository: pnFolder/pnLibrary + ref: v${{ steps.pnlibrary.outputs.version }} + path: pnLibrary + + - name: Publish pnLibrary to Maven Local + working-directory: pnLibrary + run: | + chmod +x gradlew + JAVA_HOME="$JAVA_HOME_21_X64" ./gradlew publishToMavenLocal --no-daemon --no-build-cache + - uses: gradle/actions/setup-gradle@v4 - run: chmod +x gradlew - run: ./gradlew build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 202806e..55dbe85 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,6 +15,23 @@ jobs: with: distribution: temurin java-version: 21 + - name: Read pnLibrary version + id: pnlibrary + run: echo "version=$(grep -m1 "^def pnLibraryVersion" build.gradle | cut -d"'" -f2)" >> "$GITHUB_OUTPUT" + + - name: Checkout pnLibrary + uses: actions/checkout@v4 + with: + repository: pnFolder/pnLibrary + ref: v${{ steps.pnlibrary.outputs.version }} + path: pnLibrary + + - name: Publish pnLibrary to Maven Local + working-directory: pnLibrary + run: | + chmod +x gradlew + JAVA_HOME="$JAVA_HOME_21_X64" ./gradlew publishToMavenLocal --no-daemon --no-build-cache + - uses: gradle/actions/setup-gradle@v4 - run: chmod +x gradlew - run: ./gradlew clean build diff --git a/.pnlibrary/changelogs/1.1.0.md b/.pnlibrary/changelogs/1.1.0.md new file mode 100644 index 0000000..9bfd63a --- /dev/null +++ b/.pnlibrary/changelogs/1.1.0.md @@ -0,0 +1,3 @@ +# pnRelics 1.1.0 + +- Переход на pnLibrary 0.1.0-dev.6 (API 2): нужна новая библиотека. diff --git a/RELEASE-1.1.0.md b/RELEASE-1.1.0.md new file mode 100644 index 0000000..8a52a88 --- /dev/null +++ b/RELEASE-1.1.0.md @@ -0,0 +1,4 @@ +# v1.1.0 — Переход на pnLibrary 0.1.0-dev.6 + +## Изменено +- Плагин работает с pnLibrary 0.1.0-dev.6 (API 2). Старые версии библиотеки не подойдут, обновите pnLibrary. diff --git a/build.gradle b/build.gradle index 2de525c..c4334f9 100644 --- a/build.gradle +++ b/build.gradle @@ -4,13 +4,14 @@ plugins { } group = 'ru.privatenull' -version = '1.0.1' +version = '1.1.0' base { archivesName = 'pnRelics' } repositories { + mavenLocal() mavenCentral() maven { name = 'papermc-repo' @@ -18,7 +19,7 @@ repositories { } } -def pnLibraryVersion = '0.0.1-dev.6' +def pnLibraryVersion = '0.1.0-dev.6' dependencies { compileOnly 'com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT' diff --git a/src/main/java/ru/privatenull/pnrelics/command/RelicCommand.java b/src/main/java/ru/privatenull/pnrelics/command/RelicCommand.java index 444ea08..38f65d4 100644 --- a/src/main/java/ru/privatenull/pnrelics/command/RelicCommand.java +++ b/src/main/java/ru/privatenull/pnrelics/command/RelicCommand.java @@ -5,11 +5,11 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; -import org.pnfolder.pnlibrary.api.commands.ArgumentType; -import org.pnfolder.pnlibrary.api.commands.BadUsage; +import org.pnfolder.pnlibrary.api.commands.definition.ArgumentType; +import org.pnfolder.pnlibrary.api.commands.error.BadUsage; import org.pnfolder.pnlibrary.api.commands.CommandContext; -import org.pnfolder.pnlibrary.api.commands.CommandDefinition; -import org.pnfolder.pnlibrary.api.commands.NoPermission; +import org.pnfolder.pnlibrary.api.commands.definition.CommandDefinition; +import org.pnfolder.pnlibrary.api.commands.error.NoPermission; import ru.privatenull.pnrelics.PnRelicsPlugin; import ru.privatenull.pnrelics.config.Messages; import ru.privatenull.pnrelics.config.RelicRegistry; diff --git a/src/main/java/ru/privatenull/pnrelics/integration/PluginTasks.java b/src/main/java/ru/privatenull/pnrelics/integration/PluginTasks.java index 06ea2d0..9fdcbf8 100644 --- a/src/main/java/ru/privatenull/pnrelics/integration/PluginTasks.java +++ b/src/main/java/ru/privatenull/pnrelics/integration/PluginTasks.java @@ -1,9 +1,9 @@ package ru.privatenull.pnrelics.integration; -import org.pnfolder.pnlibrary.api.tasks.TaskExecution; +import org.pnfolder.pnlibrary.api.tasks.spec.TaskExecution; import org.pnfolder.pnlibrary.api.tasks.TaskHandle; import org.pnfolder.pnlibrary.api.tasks.TaskScope; -import org.pnfolder.pnlibrary.api.tasks.TaskSpec; +import org.pnfolder.pnlibrary.api.tasks.spec.TaskSpec; /** * Единственное место, где pnRelics запускает задачи: планировщик pnLibrary ({@code ModuleContext.tasks}). diff --git a/src/main/java/ru/privatenull/pnrelics/integration/PnLibraryRuntime.java b/src/main/java/ru/privatenull/pnrelics/integration/PnLibraryRuntime.java index aeb952e..03cc020 100644 --- a/src/main/java/ru/privatenull/pnrelics/integration/PnLibraryRuntime.java +++ b/src/main/java/ru/privatenull/pnrelics/integration/PnLibraryRuntime.java @@ -2,7 +2,7 @@ import org.bukkit.plugin.java.JavaPlugin; import org.pnfolder.pnlibrary.api.diagnostics.DiagnosticConfiguration; -import org.pnfolder.pnlibrary.api.diagnostics.DiagnosticContainer; +import org.pnfolder.pnlibrary.api.diagnostics.report.DiagnosticContainer; import org.pnfolder.pnlibrary.api.plugin.ModuleContext; import org.pnfolder.pnlibrary.api.plugin.PluginRegistration; import org.pnfolder.pnlibrary.api.remote.PolicyErrorAction; @@ -10,7 +10,7 @@ import org.pnfolder.pnlibrary.api.runtime.PnLibrary; import org.pnfolder.pnlibrary.api.runtime.PnLibraryIdentity; import org.pnfolder.pnlibrary.api.runtime.PnLibraryProvider; -import org.pnfolder.pnlibrary.api.updates.UpdateChannel; +import org.pnfolder.pnlibrary.api.updates.product.UpdateChannel; import java.util.function.Supplier; import java.util.logging.Level; @@ -105,7 +105,7 @@ public void stopped() { } /** Регистрирует команду в pnLibrary (записи в plugin.yml не нужно). */ - public void registerCommand(org.pnfolder.pnlibrary.api.commands.CommandDefinition command) { + public void registerCommand(org.pnfolder.pnlibrary.api.commands.definition.CommandDefinition command) { module.registerCommand(command); }