From a4cfa23ae999ac82d7a6c15cac415ff86b1b0a36 Mon Sep 17 00:00:00 2001 From: overdyn Date: Sat, 21 Nov 2026 16:36:12 +0100 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20pnLibrary=200.1.0-dev.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 17 +++++++++++++++++ .github/workflows/release.yml | 17 +++++++++++++++++ .pnlibrary/changelogs/1.3.0.md | 3 +++ RELEASE-1.3.0.md | 4 ++++ build.gradle | 5 +++-- .../pncaptcha/integration/PnLibraryRuntime.kt | 4 ++-- .../integration/TaskScopeExtensions.kt | 2 +- 7 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 .pnlibrary/changelogs/1.3.0.md create mode 100644 RELEASE-1.3.0.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c45fcd4..c4f2653 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,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 with: gradle-version: '9.7.0' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e670bde..94727ce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,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 with: gradle-version: '9.7.0' diff --git a/.pnlibrary/changelogs/1.3.0.md b/.pnlibrary/changelogs/1.3.0.md new file mode 100644 index 0000000..4ff7bdd --- /dev/null +++ b/.pnlibrary/changelogs/1.3.0.md @@ -0,0 +1,3 @@ +# pnCaptcha 1.3.0 + +- Переход на pnLibrary 0.1.0-dev.6 (API 2): нужна новая библиотека. diff --git a/RELEASE-1.3.0.md b/RELEASE-1.3.0.md new file mode 100644 index 0000000..b2da9ee --- /dev/null +++ b/RELEASE-1.3.0.md @@ -0,0 +1,4 @@ +# v1.3.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 d7fce06..1ec2254 100644 --- a/build.gradle +++ b/build.gradle @@ -5,11 +5,12 @@ plugins { } group = 'ru.privatenull' -version = '1.2.4' +version = '1.3.0' -def pnLibraryVersion = '0.0.1-dev.6' +def pnLibraryVersion = '0.1.0-dev.6' repositories { + mavenLocal() mavenCentral() maven { name = 'papermc'; url = uri('https://repo.papermc.io/repository/maven-public/') } maven { name = 'elytrium'; url = uri('https://maven.elytrium.net/repo/') } diff --git a/src/main/kotlin/ru/privatenull/pncaptcha/integration/PnLibraryRuntime.kt b/src/main/kotlin/ru/privatenull/pncaptcha/integration/PnLibraryRuntime.kt index ec9d694..1907649 100644 --- a/src/main/kotlin/ru/privatenull/pncaptcha/integration/PnLibraryRuntime.kt +++ b/src/main/kotlin/ru/privatenull/pncaptcha/integration/PnLibraryRuntime.kt @@ -1,7 +1,7 @@ package ru.privatenull.pncaptcha.integration 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.logging.PnLogger import org.pnfolder.pnlibrary.api.plugin.ModuleContext import org.pnfolder.pnlibrary.api.plugin.PluginRegistration @@ -10,7 +10,7 @@ import org.pnfolder.pnlibrary.api.remote.RemotePolicySettings 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 org.slf4j.Logger import ru.privatenull.pncaptcha.log.Log import java.nio.file.Path diff --git a/src/main/kotlin/ru/privatenull/pncaptcha/integration/TaskScopeExtensions.kt b/src/main/kotlin/ru/privatenull/pncaptcha/integration/TaskScopeExtensions.kt index 7711304..a00fab3 100644 --- a/src/main/kotlin/ru/privatenull/pncaptcha/integration/TaskScopeExtensions.kt +++ b/src/main/kotlin/ru/privatenull/pncaptcha/integration/TaskScopeExtensions.kt @@ -2,7 +2,7 @@ package ru.privatenull.pncaptcha.integration 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 import java.time.Duration /** Запускает [action] один раз через [delay]. */