Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions .pnlibrary/changelogs/1.3.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# pnCaptcha 1.3.0

- Переход на pnLibrary 0.1.0-dev.6 (API 2): нужна новая библиотека.
4 changes: 4 additions & 0 deletions RELEASE-1.3.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# v1.3.0 — Переход на pnLibrary 0.1.0-dev.6

## Изменено
- Плагин работает с pnLibrary 0.1.0-dev.6 (API 2). Старые версии библиотеки не подойдут, обновите pnLibrary.
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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/') }
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]. */
Expand Down
Loading