From 16cebedd3e41ad70c0420f046b53c14f4dd5dbb0 Mon Sep 17 00:00:00 2001 From: Aleksei Tiurin Date: Mon, 24 Jun 2024 12:20:51 +0300 Subject: [PATCH] remote publish --- .github/workflows/android-pipeline.yml | 4 +- .github/workflows/docs.yml | 2 +- .github/workflows/publish.yml | 8 +++- docs/docusaurus.config.ts | 63 ++------------------------ gradle.properties | 6 --- ultron-android/build.gradle.kts | 1 - ultron-compose/build.gradle.kts | 9 ++++ 7 files changed, 23 insertions(+), 70 deletions(-) diff --git a/.github/workflows/android-pipeline.yml b/.github/workflows/android-pipeline.yml index 2ace6acb..7302d7fa 100644 --- a/.github/workflows/android-pipeline.yml +++ b/.github/workflows/android-pipeline.yml @@ -7,7 +7,7 @@ on: branches: [ master ] jobs: - run_tests_on_api_29: + compileKotlin: runs-on: macos-latest steps: - uses: actions/checkout@v4 @@ -17,4 +17,4 @@ jobs: java-version: '17' - name: Compile framework - run: ./gradlew :ultron:compileDebugKotlin + run: ./gradlew compileDebugKotlin diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7dd12eec..4964e8d7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: Build and deploy docs on: push: branches: - - kmp + - master jobs: github-pages: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1599d4e1..f27e0e9c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,7 +6,7 @@ permissions: on: push: branches: - - kmp-publishing + - kmp jobs: publish: @@ -58,3 +58,9 @@ jobs: - name: Gradle publish run: ./gradlew "${{ matrix.target }}" closeAndReleaseSonatypeStagingRepository + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_TOKEN }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + OSSRH_STAGING_PROFILE_ID: ${{ secrets.OSSRH_STAGING_PROFILE_ID }} + SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }} + SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} diff --git a/docs/docusaurus.config.ts b/docs/docusaurus.config.ts index f620c74d..891d3b4f 100644 --- a/docs/docusaurus.config.ts +++ b/docs/docusaurus.config.ts @@ -42,7 +42,6 @@ const config: Config = { ], themeConfig: { - // Replace with your project's social card image: 'img/docusaurus-social-card.jpg', navbar: { title: 'Ultron', @@ -79,71 +78,17 @@ const config: Config = { darkTheme: prismThemes.dracula, }, algolia: { - // The application ID provided by Algolia appId: 'TLB3E9OO68', - - // Public API key: it is safe to commit it apiKey: '06f26f943a74848657b1e5bec4c85aaf', - indexName: 'open-toolio', - - // Optional: see doc section below contextualSearch: true, - - // Optional: Replace parts of the item URLs from Algolia. Useful when using the same search index for multiple deployments using a different baseUrl. You can use regexp or string in the `from` param. For example: localhost:3000 vs myCompany.com/docs -// replaceSearchResultPathname: { -// from: '/docs/', // or as RegExp: /\/docs\// -// to: '/', -// }, - - // Optional: Algolia search parameters searchParameters: {}, - - // Optional: whether the insights feature is enabled or not on Docsearch (`false` by default) insights: false, }, - // footer: { - // style: 'dark', - // links: [ - // { - // title: 'Docs', - // items: [ - // { - // label: 'Tutorial', - // to: '/docs/intro', - // }, - // ], - // }, - // { - // title: 'Community', - // items: [ - // { - // label: 'Telegram', - // href: 'https://t.me/ultron_framework', - // } - // ], - // }, - // { - // title: 'More', - // items: [ - // { - // label: 'Blog', - // to: '/blog', - // }, - // { - // label: 'GitHub', - // href: 'https://github.com/open-tool/ultron', - // }, - // ], - // }, - // ], - // copyright: `Copyright © ${new Date().getFullYear()} My Project, Inc. Built with Docusaurus.`, - // }, - - // https://docusaurus.io/blog/2021/11/21/algolia-docsearch-migration#docsearch-has-a-new-home - // algolia: { - // contextualSearch: true, - // }, + prism: { + theme: prismThemes.github, + darkTheme: prismThemes.dracula, + }, } satisfies Preset.ThemeConfig, plugins: [ diff --git a/gradle.properties b/gradle.properties index 2f525bb2..34b1ca06 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,9 +14,3 @@ kotlin.mpp.enableCInteropCommonization=true GROUP=com.atiurin POM_ARTIFACT_ID=ultron VERSION_NAME=2.5.0-alpha04 - -signing.gnupg.passphrase=${OSSRH_GPG_SECRET_KEY_PASSWORD} -signing.gnupg.keyName=${OSSRH_GPG_SECRET_KEY_ID} -sonatypeUsername=${OSSRH_TOKEN} -sonatypePassword=${OSSRH_PASSWORD} -sonatypeStagingProfileId=${OSSRH_STAGING_PROFILE_ID} diff --git a/ultron-android/build.gradle.kts b/ultron-android/build.gradle.kts index 20817a42..b17a505e 100644 --- a/ultron-android/build.gradle.kts +++ b/ultron-android/build.gradle.kts @@ -113,7 +113,6 @@ tasks.named("generateMetadataFileForReleasePublication") { } signing { - println("Signing lib...") useGpgCmd() sign(publishing.publications) } diff --git a/ultron-compose/build.gradle.kts b/ultron-compose/build.gradle.kts index 376abd7d..f877604a 100644 --- a/ultron-compose/build.gradle.kts +++ b/ultron-compose/build.gradle.kts @@ -119,6 +119,15 @@ tasks.withType().configureEach { mustRunAfter(tasks.withType()) } +tasks.withType().configureEach { + dependsOn("signJvmPublication") + dependsOn("signKotlinMultiplatformPublication") + dependsOn("signAndroidReleasePublication") + mustRunAfter("signJvmPublication") + mustRunAfter("signKotlinMultiplatformPublication") + mustRunAfter("signAndroidReleasePublication") +} + signing { println("Signing lib...") useGpgCmd()