From 48631d44174d6599c432d8e456a507db13154af6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:14:31 +0000 Subject: [PATCH 01/13] version is now 0.0.3-SNAPSHOT (#8) Co-authored-by: librarian[bot] --- librarian.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/librarian.properties b/librarian.properties index 4611b65..340ed0d 100644 --- a/librarian.properties +++ b/librarian.properties @@ -9,7 +9,7 @@ sonatype.host=S01 git.snapshots=main pom.groupId=com.apollographql.java -pom.version=0.0.2 +pom.version=0.0.3-SNAPSHOT pom.description=Apollo Kotlin Java Support pom.vcsUrl=https://github.com/apollographql/apollo-kotlin-java-support pom.developer=Apollo Kotlin Java Support contributors From 31bc3aaf138a6d4ad9decf543cea69d49b537fee Mon Sep 17 00:00:00 2001 From: BoD Date: Mon, 8 Jul 2024 19:50:56 +0200 Subject: [PATCH 02/13] Fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9db1ad..4b3ae4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ PUT_CHANGELOG_HERE # Version 0.0.2 _2024-07-08_ -PUT_CHANGELOG_HERE +Update to Apollo Kotlin 4.0.0-rc.1 # Version 0.0.1 _2024-06-24_ From fb2a6c34f7f10769e570d1803a0b592ed486b796 Mon Sep 17 00:00:00 2001 From: Martin Bonnin Date: Fri, 12 Jul 2024 10:52:57 +0200 Subject: [PATCH 03/13] Synchronize docs with other projects --- ...l-request.yaml => build-pull-request.yaml} | 7 +- .../{publish-doc.yaml => publish-docs.yaml} | 9 ++- .github/workflows/publish-release.yaml | 12 ++-- .github/workflows/publish-snapshot.yaml | 12 ++-- .gitignore | 28 +------- .idea/codeStyles/Project.xml | 67 ------------------ .idea/icon.png | Bin 0 -> 33487 bytes CODEOWNERS | 2 +- README.md | 25 ++++++- Writerside/cfg/buildprofiles.xml | 7 +- Writerside/doc.tree | 10 +-- Writerside/images/apollo_logo.svg | 14 ++++ Writerside/images/favicon-192x192.png | Bin 0 -> 16083 bytes Writerside/images/favicon-96x96.png | Bin 0 -> 8084 bytes .../topics/{starter-topic.md => welcome.md} | 3 +- Writerside/v.list | 3 +- build-logic/build.gradle.kts | 13 ---- build-logic/settings.gradle.kts | 14 ---- build.gradle.kts | 13 ++-- client/build.gradle.kts | 4 +- librarian.properties | 4 +- rx2/build.gradle.kts | 4 +- rx3/build.gradle.kts | 4 +- settings.gradle.kts | 2 - 24 files changed, 85 insertions(+), 172 deletions(-) rename .github/workflows/{check-pull-request.yaml => build-pull-request.yaml} (59%) rename .github/workflows/{publish-doc.yaml => publish-docs.yaml} (89%) create mode 100644 .idea/icon.png create mode 100644 Writerside/images/apollo_logo.svg create mode 100644 Writerside/images/favicon-192x192.png create mode 100644 Writerside/images/favicon-96x96.png rename Writerside/topics/{starter-topic.md => welcome.md} (99%) delete mode 100644 build-logic/build.gradle.kts delete mode 100644 build-logic/settings.gradle.kts diff --git a/.github/workflows/check-pull-request.yaml b/.github/workflows/build-pull-request.yaml similarity index 59% rename from .github/workflows/check-pull-request.yaml rename to .github/workflows/build-pull-request.yaml index 2759a9f..53ac625 100644 --- a/.github/workflows/check-pull-request.yaml +++ b/.github/workflows/build-pull-request.yaml @@ -1,13 +1,12 @@ -name: check-pull-request +name: Build pull request on: pull_request jobs: - check-pull-request: + build-pull-request: runs-on: macos-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7 - run: | - ./gradlew build - ./gradlew -p tests build + ./gradlew build diff --git a/.github/workflows/publish-doc.yaml b/.github/workflows/publish-docs.yaml similarity index 89% rename from .github/workflows/publish-doc.yaml rename to .github/workflows/publish-docs.yaml index 3c3bb6a..4e8b189 100644 --- a/.github/workflows/publish-doc.yaml +++ b/.github/workflows/publish-docs.yaml @@ -2,7 +2,7 @@ name: Publish documentation on: push: - branches: [ "main" ] + branches: ["main"] workflow_dispatch: env: @@ -11,7 +11,7 @@ env: DOCKER_VERSION: '241.16003' jobs: - build: + build-docs: runs-on: ubuntu-latest steps: - name: Checkout repository @@ -28,10 +28,9 @@ jobs: - name: Prepare static content run: | - export JAVA_HOME=$JAVA_HOME_21_X64 ./gradlew dokkatooGeneratePublicationHtml mkdir -p build/static - cp -rf build/dokka build/static/kdoc + cp -rf build/dokka/html build/static/kdoc unzip artifacts/webHelpDOC2-all.zip -d build/static - name: Deploy Kdoc to github pages @@ -46,4 +45,4 @@ jobs: name: docs path: | artifacts/${{ env.ARTIFACT }} - retention-days: 7 + retention-days: 7 \ No newline at end of file diff --git a/.github/workflows/publish-release.yaml b/.github/workflows/publish-release.yaml index 8f0b2c6..85bcd28 100644 --- a/.github/workflows/publish-release.yaml +++ b/.github/workflows/publish-release.yaml @@ -1,4 +1,4 @@ -name: publish-release +name: Publish release on: workflow_dispatch: @@ -13,11 +13,11 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7 - run: | - ./gradlew librarianReleaseStagingRepo + ./gradlew librarianPublishToMavenCentral gh release create $GITHUB_REF_NAME --title $GITHUB_REF_NAME --verify-tag --notes-from-tag env: - LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - LIBRARIAN_SIGNING_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }} + LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.LIBRARIAN_SONATYPE_USERNAME }} + LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.LIBRARIAN_SONATYPE_PASSWORD }} + LIBRARIAN_SIGNING_PRIVATE_KEY: ${{ secrets.LIBRARIAN_SIGNING_PRIVATE_KEY }} + LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD }} GH_TOKEN: ${{ github.token }} \ No newline at end of file diff --git a/.github/workflows/publish-snapshot.yaml b/.github/workflows/publish-snapshot.yaml index 756f356..7e16006 100644 --- a/.github/workflows/publish-snapshot.yaml +++ b/.github/workflows/publish-snapshot.yaml @@ -1,4 +1,4 @@ -name: publish-snapshot +name: Publish snapshot on: push: @@ -10,9 +10,9 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7 - run: | - ./gradlew librarianPublishToSnapshots + ./gradlew librarianPublishToMavenSnapshots env: - LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} - LIBRARIAN_SIGNING_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }} + LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.LIBRARIAN_SONATYPE_USERNAME }} + LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.LIBRARIAN_SONATYPE_PASSWORD }} + LIBRARIAN_SIGNING_PRIVATE_KEY: ${{ secrets.LIBRARIAN_SIGNING_PRIVATE_KEY }} + LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD }} diff --git a/.gitignore b/.gitignore index 9ed9337..3c00b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,40 +11,16 @@ # Generated files build -/reports .kotlin # Place where the Android SDK path is set local.properties -# Secret used by sample apps -github_token - -# XCode +# XCode xcuserdata project.xcworkspace -# Mac OS Finder +# Mac OS Finder .DS_Store Thumbs.db -db.json -*.log - -# Docs -node_modules/ -/docs/public -/docs/.cache -!docs/public/_redirects -.deploy*/ -docs.json -package-lock.json -**/.project -.vscode/** -**/bin -.sqldelight - -# Local Netlify folder -.netlify -# IntelliJ plugin -intellij-plugin/mockJDK diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index d69494f..aaa4877 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -7,74 +7,7 @@