From ae388cd7d5877724f57438ddd0317b94df4f1f72 Mon Sep 17 00:00:00 2001 From: Vilius Sutkus '89 Date: Sat, 6 Jan 2024 10:02:46 +0200 Subject: [PATCH] Move library to app.opendocument group --- .github/workflows/release.yml | 62 +++++++++---------- pdf2htmlEX/build.gradle | 5 ++ .../android/pdf2htmlex/pdf2htmlEX.java | 8 +++ 3 files changed, 44 insertions(+), 31 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e7a23fe..03a02464 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,9 +42,9 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - with: +# with: # A branch is required for post release version increment commit - ref: ${{ github.event.ref }} +# ref: ${{ github.event.ref }} - uses: actions/setup-java@v4 with: distribution: temurin @@ -60,32 +60,32 @@ jobs: SIGNING_KEY: ${{ secrets.SIGNING_KEY }} SIGNING_PASS: ${{ secrets.SIGNING_PASS }} - - run: ./ci-scripts/updateDownstreamVersion - id: updateDownstreamVersion - - - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: "Update version in README.md (${{ steps.updateDownstreamVersion.outputs.version }})" - file_pattern: ${{ steps.updateDownstreamVersion.outputs.files }} - - - name: Create GitHub Release - uses: ncipollo/release-action@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - tag: "v${{ steps.updateDownstreamVersion.outputs.version }}" - name: "${{ github.event.repository.name }} v${{ steps.updateDownstreamVersion.outputs.version }}" - bodyFile: "UpcomingReleaseNotes.md" - - - run: ./ci-scripts/incrementVersion --patch - id: postReleaseVersionIncrement - - - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: "Post release library version increment to ${{ steps.postReleaseVersionIncrement.outputs.newVersion }} (from ${{ steps.postReleaseVersionIncrement.outputs.oldVersion }})" - file_pattern: ${{ steps.postReleaseVersionIncrement.outputs.files }} - - - run: echo -n > UpcomingReleaseNotes.md - - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: "Post release truncation of UpcomingReleaseNotes.md" - file_pattern: UpcomingReleaseNotes.md +# - run: ./ci-scripts/updateDownstreamVersion +# id: updateDownstreamVersion +# +# - uses: stefanzweifel/git-auto-commit-action@v5 +# with: +# commit_message: "Update version in README.md (${{ steps.updateDownstreamVersion.outputs.version }})" +# file_pattern: ${{ steps.updateDownstreamVersion.outputs.files }} +# +# - name: Create GitHub Release +# uses: ncipollo/release-action@v1 +# with: +# token: ${{ secrets.GITHUB_TOKEN }} +# tag: "v${{ steps.updateDownstreamVersion.outputs.version }}" +# name: "${{ github.event.repository.name }} v${{ steps.updateDownstreamVersion.outputs.version }}" +# bodyFile: "UpcomingReleaseNotes.md" +# +# - run: ./ci-scripts/incrementVersion --patch +# id: postReleaseVersionIncrement +# +# - uses: stefanzweifel/git-auto-commit-action@v5 +# with: +# commit_message: "Post release library version increment to ${{ steps.postReleaseVersionIncrement.outputs.newVersion }} (from ${{ steps.postReleaseVersionIncrement.outputs.oldVersion }})" +# file_pattern: ${{ steps.postReleaseVersionIncrement.outputs.files }} +# +# - run: echo -n > UpcomingReleaseNotes.md +# - uses: stefanzweifel/git-auto-commit-action@v5 +# with: +# commit_message: "Post release truncation of UpcomingReleaseNotes.md" +# file_pattern: UpcomingReleaseNotes.md diff --git a/pdf2htmlEX/build.gradle b/pdf2htmlEX/build.gradle index bc3acdc5..5cbdcca2 100644 --- a/pdf2htmlEX/build.gradle +++ b/pdf2htmlEX/build.gradle @@ -106,6 +106,11 @@ publishing { distribution = 'repo' } } + distributionManagement { + relocation { + groupId.set("app.opendocument") + } + } } } } diff --git a/pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX.java b/pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX.java index baa80e2b..16475805 100644 --- a/pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX.java +++ b/pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX.java @@ -34,6 +34,14 @@ import java.io.IOException; +/** + * @deprecated This library is now part of OpenDocument App group. + * Edit your build.gradle to depend on + * implementation("app.opendocument:pdf2htmlex-android:+") + * instead of + * implementation("com.viliussutkus89:pdf2htmlex-android:+") + */ +@Deprecated @SuppressWarnings("unused") public class pdf2htmlEX implements Closeable { public static class ConversionFailedException extends Exception {