From aaf2e7bc5df2bd2867544cb28ce73ff0db11e9af Mon Sep 17 00:00:00 2001 From: overcat <4catcode@gmail.com> Date: Tue, 5 Sep 2023 15:49:09 +0800 Subject: [PATCH 1/4] Generate separate stellar-sdk-javadoc.jar release artifact --- .github/workflows/test-deploy.yml | 25 +++++++++++++++++++++++++ build.gradle | 25 ++++++++++++++++++------- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 95bbf1589..1aab765c9 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -66,6 +66,25 @@ jobs: name: javadoc path: javadoc + javadoc_jar: + needs: test + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + - name: Set up JDK + uses: actions/setup-java@v2 + with: + java-version: ${{ env.JAVA_VERSION }} + distribution: ${{ env.JAVA_DISTRIBUTION }} + - name: Generate JavaDoc Jar + run: ./gradlew javadocJar + - name: Persist Documentation + uses: actions/upload-artifact@v3 + with: + name: javadoc_jar + path: build/libs/stellar-sdk-javadoc.jar + android-test: needs: shadow_jar runs-on: macos-latest @@ -116,6 +135,11 @@ jobs: with: name: javadoc path: javadoc + - name: Download javadocJar + uses: actions/download-artifact@v2 + with: + name: javadoc_jar + path: javadoc_jar - name: Archive Documentation run: tar -czf stellar-sdk-javadoc.tar.gz javadoc - name: Upload artifacts to GitHub Release @@ -123,6 +147,7 @@ jobs: with: files: | jar/stellar-sdk.jar + javadoc_jar/stellar-sdk-javadoc.jar stellar-sdk-javadoc.tar.gz - name: Upload Documentation to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 diff --git a/build.gradle b/build.gradle index 02eaede5f..910e5928c 100644 --- a/build.gradle +++ b/build.gradle @@ -33,13 +33,6 @@ compileJava.options.encoding = 'UTF-8' compileTestJava.options.encoding = 'UTF-8' javadoc.options.encoding = 'UTF-8' -publishing { - publications { - sdkLibrary(MavenPublication) { publication -> - project.shadow.component(publication) - } - } -} shadowJar { manifest { @@ -114,4 +107,22 @@ tasks.javadoc { options.setSplitIndex(true) options.setMemberLevel(JavadocMemberLevel.PUBLIC) options.setEncoding('UTF-8') +} + +tasks.register('javadocJar', Jar) { + dependsOn javadoc + archiveClassifier.set('javadoc') + from javadoc.destinationDir + archiveFileName.set('stellar-sdk-javadoc.jar') +} + +publishing { + publications { + sdkLibrary(MavenPublication) { publication -> + project.shadow.component(publication) + } + javadocPublication(MavenPublication) { publication -> + artifact tasks.javadocJar + } + } } \ No newline at end of file From 0b2b1f638ebdc9741f4da93104cb5e2a564fdebc Mon Sep 17 00:00:00 2001 From: overcat <4catcode@gmail.com> Date: Tue, 5 Sep 2023 15:54:40 +0800 Subject: [PATCH 2/4] Generate separate stellar-sdk-javadoc.jar release artifact --- .github/workflows/test-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 7f56c3364..e87a82991 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -121,7 +121,7 @@ jobs: profile: 'pixel_2' deploy: - needs: [ javadoc, shadow_jar ] # TODO: add android-test when it is stable. + needs: [ javadoc, shadow_jar, javadoc_jar ] # TODO: add android-test when it is stable. permissions: contents: write if: github.event_name == 'release' && github.event.action == 'created' From 1f7a52ddf9d0a939a323ee4d20a9f22952a02013 Mon Sep 17 00:00:00 2001 From: overcat <4catcode@gmail.com> Date: Tue, 5 Sep 2023 15:57:23 +0800 Subject: [PATCH 3/4] Generate separate stellar-sdk-javadoc.jar release artifact --- .github/workflows/test-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index e87a82991..7faddae6d 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -77,9 +77,9 @@ jobs: with: java-version: ${{ env.JAVA_VERSION }} distribution: ${{ env.JAVA_DISTRIBUTION }} - - name: Generate JavaDoc Jar + - name: Generate javadocJar run: ./gradlew javadocJar - - name: Persist Documentation + - name: Persist javadocJar uses: actions/upload-artifact@v3 with: name: javadoc_jar From d7664711fd037e6c81bea50d12639e2e13ec5458 Mon Sep 17 00:00:00 2001 From: overcat <4catcode@gmail.com> Date: Tue, 5 Sep 2023 16:12:11 +0800 Subject: [PATCH 4/4] rerun ci