diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c49bace..a034ff6 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.6.0.md b/.pnlibrary/changelogs/1.6.0.md new file mode 100644 index 0000000..43f37a3 --- /dev/null +++ b/.pnlibrary/changelogs/1.6.0.md @@ -0,0 +1,3 @@ +# pnCases 1.6.0 + +- Переход на pnLibrary 0.1.0-dev.6 (API 2): нужна новая библиотека. diff --git a/RELEASE-1.6.0.md b/RELEASE-1.6.0.md new file mode 100644 index 0000000..5ed43ba --- /dev/null +++ b/RELEASE-1.6.0.md @@ -0,0 +1,4 @@ +# v1.6.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 305ef86..475ed6b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,10 @@ plugins { } group = 'ru.privatenull' -version = '1.5.4-remaster' +version = '1.6.0' repositories { + mavenLocal() mavenCentral() maven { name = "papermc-repo" @@ -31,7 +32,7 @@ repositories { } } -def pnLibraryVersion = '0.0.1-dev.6' +def pnLibraryVersion = '0.1.0-dev.6' dependencies { // The shared runtime plugin is installed by the pnLibrary bootstrap that is shaded into the jar; diff --git a/src/main/java/ru/privatenull/pncases/integration/PnLibraryRuntime.java b/src/main/java/ru/privatenull/pncases/integration/PnLibraryRuntime.java index 7f4a82d..316c279 100644 --- a/src/main/java/ru/privatenull/pncases/integration/PnLibraryRuntime.java +++ b/src/main/java/ru/privatenull/pncases/integration/PnLibraryRuntime.java @@ -5,7 +5,7 @@ import org.pnfolder.pnlibrary.localization.TranslationRequest; import org.pnfolder.pnlibrary.api.placeholders.PlaceholderService; 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.MessageBox; import org.pnfolder.pnlibrary.api.plugin.ModuleContext; import org.pnfolder.pnlibrary.api.plugin.PluginRegistration; @@ -14,11 +14,11 @@ 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.pnfolder.pnlibrary.api.updates.UpdateRegistration; -import org.pnfolder.pnlibrary.api.updates.UpdateSnapshot; -import org.pnfolder.pnlibrary.api.tasks.TaskExecution; -import org.pnfolder.pnlibrary.api.tasks.TaskSpec; +import org.pnfolder.pnlibrary.api.updates.state.UpdateSnapshot; +import org.pnfolder.pnlibrary.api.tasks.spec.TaskExecution; +import org.pnfolder.pnlibrary.api.tasks.spec.TaskSpec; import ru.privatenull.pncases.support.task.PluginTasks; import ru.privatenull.pncases.support.task.TaskBackend;