From fe391f6af51717a3e99d9c03593dfd59c333b465 Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Tue, 25 Jun 2024 12:27:37 +0300 Subject: [PATCH 1/5] Update publish-core.gradle --- publish-core.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/publish-core.gradle b/publish-core.gradle index 088263b..b81c195 100644 --- a/publish-core.gradle +++ b/publish-core.gradle @@ -22,6 +22,8 @@ if (propertiesFile.exists()) { println "Properties file not found: $propertiesFilePath or $propertiesFilePath_alternative" } +println("############# RELEASE_TAG ${System.getenv("RELEASE_TAG")}") + ext { signingKeyId = (System.getenv("ANDROID_NEXUS_SIGNING_KEY_ID") ?: properties["signingKeyId"]) ?: println("signingKeyId was NOT found") signingPassword = (System.getenv("ANDROID_NEXUS_SIGNING_PASSWORD") ?: properties["signingPassword"]) ?: println("signingPassword was NOT found") From b4399bea7ddefc9763d0da4ffc20dd8b172a6fef Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Tue, 25 Jun 2024 12:36:14 +0300 Subject: [PATCH 2/5] . --- VCL/build.gradle | 6 +++--- publish-core.gradle | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/VCL/build.gradle b/VCL/build.gradle index d40d681..e89c69f 100644 --- a/VCL/build.gradle +++ b/VCL/build.gradle @@ -74,8 +74,8 @@ java { } /** - * Publish Android library to GitHub Packages ====================================================== - */ + * Publish Android library ====================================================== +*/ def getVersionName = { -> return android.defaultConfig.versionName } @@ -224,7 +224,7 @@ repositories { } /** * ================================================================================================= - */ +*/ dependencies { implementation 'androidx.core:core-ktx:1.12.0' diff --git a/publish-core.gradle b/publish-core.gradle index b81c195..c80bc0b 100644 --- a/publish-core.gradle +++ b/publish-core.gradle @@ -23,6 +23,8 @@ if (propertiesFile.exists()) { } println("############# RELEASE_TAG ${System.getenv("RELEASE_TAG")}") +println("############# ANDROID_NEXUS_SIGNING_KEY_ID ${System.getenv("ANDROID_NEXUS_SIGNING_KEY_ID")}") +println("############# ANDROID_NEXUS_OSSRH_TOKEN_USERNAME ${System.getenv("ANDROID_NEXUS_OSSRH_TOKEN_USERNAME")}") ext { signingKeyId = (System.getenv("ANDROID_NEXUS_SIGNING_KEY_ID") ?: properties["signingKeyId"]) ?: println("signingKeyId was NOT found") From 3245257a953beccbea365c18251251e1561affd2 Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Tue, 25 Jun 2024 12:45:06 +0300 Subject: [PATCH 3/5] Update android-sdk.yml --- .github/workflows/android-sdk.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-sdk.yml b/.github/workflows/android-sdk.yml index c40f48c..6b70ec1 100644 --- a/.github/workflows/android-sdk.yml +++ b/.github/workflows/android-sdk.yml @@ -68,7 +68,10 @@ jobs: # Publish Prod/Rc - name: Publish Prod/Rc if: ${{ env.GLOBAL_ENV == 'prod' || env.GLOBAL_ENV == 'rc' }} - run: ./gradlew publish${{ env.RELEASE_TAG }} + run: | + echo "ANDROID_NEXUS_SIGNING_KEY_ID: $ANDROID_NEXUS_SIGNING_KEY_ID" + echo "ANDROID_NEXUS_OSSRH_TOKEN_USERNAME: $ANDROID_NEXUS_OSSRH_TOKEN_USERNAME" + ./gradlew publish${{ env.RELEASE_TAG }} env: RELEASE_TAG: ${{ env.GLOBAL_ENV == 'prod' && format('{0}', 'Release' ) || 'Rc' }} ANDROID_NEXUS_OSSRH_TOKEN_USERNAME: ${{ secrets.ANDROID_NEXUS_OSSRH_TOKEN_USERNAME }} From 14c458e7d428e832f0b6b579f5dc949954ee2401 Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Tue, 25 Jun 2024 12:56:14 +0300 Subject: [PATCH 4/5] Update android-sdk.yml --- .github/workflows/android-sdk.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android-sdk.yml b/.github/workflows/android-sdk.yml index 6b70ec1..6b62e0c 100644 --- a/.github/workflows/android-sdk.yml +++ b/.github/workflows/android-sdk.yml @@ -55,6 +55,12 @@ jobs: run: ./gradlew assemble${{ env.RELEASE_TAG }} env: RELEASE_TAG: ${{ env.GLOBAL_ENV == 'prod' && format('{0}', 'Release' ) || 'Rc' }} + ANDROID_NEXUS_OSSRH_TOKEN_USERNAME: ${{ secrets.ANDROID_NEXUS_OSSRH_TOKEN_USERNAME }} + ANDROID_NEXUS_OSSRH_TOKEN_PASSWORD: ${{ secrets.ANDROID_NEXUS_OSSRH_TOKEN_PASSWORD }} + ANDROID_NEXUS_SIGNING_KEY_ID: ${{ secrets.ANDROID_NEXUS_SIGNING_KEY_ID }} + ANDROID_NEXUS_SIGNING_PASSWORD: ${{ secrets.ANDROID_NEXUS_SIGNING_PASSWORD }} + ANDROID_NEXUS_STAGING_PROFILE_ID: ${{ secrets.ANDROID_NEXUS_STAGING_PROFILE_ID }} + ANDROID_NEXUS_PRIVATE_KEY: ${{ secrets.ANDROID_NEXUS_PRIVATE_KEY }} # Convert artifact to lowercase - name: Rename artifact to lowercase run: mv ${{ env.ARTIFACT_PATH}}/${{ env.PACKAGE_TYPE }}/VCL-${{ env.RELEASE_TAG }}.${{ env.PACKAGE_TYPE }} ${{ env.ARTIFACT_PATH }}/${{ env.PACKAGE_TYPE }}/vcl-${{ env.RELEASE_TAG }}.${{ env.PACKAGE_TYPE }} @@ -68,10 +74,7 @@ jobs: # Publish Prod/Rc - name: Publish Prod/Rc if: ${{ env.GLOBAL_ENV == 'prod' || env.GLOBAL_ENV == 'rc' }} - run: | - echo "ANDROID_NEXUS_SIGNING_KEY_ID: $ANDROID_NEXUS_SIGNING_KEY_ID" - echo "ANDROID_NEXUS_OSSRH_TOKEN_USERNAME: $ANDROID_NEXUS_OSSRH_TOKEN_USERNAME" - ./gradlew publish${{ env.RELEASE_TAG }} + run: ./gradlew publish${{ env.RELEASE_TAG }} env: RELEASE_TAG: ${{ env.GLOBAL_ENV == 'prod' && format('{0}', 'Release' ) || 'Rc' }} ANDROID_NEXUS_OSSRH_TOKEN_USERNAME: ${{ secrets.ANDROID_NEXUS_OSSRH_TOKEN_USERNAME }} From a4c4160e47e5c921da63c845cc530e6d8cffc59e Mon Sep 17 00:00:00 2001 From: Michael Avoyan Date: Tue, 25 Jun 2024 13:10:40 +0300 Subject: [PATCH 5/5] Update publish-core.gradle --- publish-core.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/publish-core.gradle b/publish-core.gradle index c80bc0b..088263b 100644 --- a/publish-core.gradle +++ b/publish-core.gradle @@ -22,10 +22,6 @@ if (propertiesFile.exists()) { println "Properties file not found: $propertiesFilePath or $propertiesFilePath_alternative" } -println("############# RELEASE_TAG ${System.getenv("RELEASE_TAG")}") -println("############# ANDROID_NEXUS_SIGNING_KEY_ID ${System.getenv("ANDROID_NEXUS_SIGNING_KEY_ID")}") -println("############# ANDROID_NEXUS_OSSRH_TOKEN_USERNAME ${System.getenv("ANDROID_NEXUS_OSSRH_TOKEN_USERNAME")}") - ext { signingKeyId = (System.getenv("ANDROID_NEXUS_SIGNING_KEY_ID") ?: properties["signingKeyId"]) ?: println("signingKeyId was NOT found") signingPassword = (System.getenv("ANDROID_NEXUS_SIGNING_PASSWORD") ?: properties["signingPassword"]) ?: println("signingPassword was NOT found")