From 9d9b681e874b01242a19dad365c3e05897fb2003 Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 14:45:35 -0400 Subject: [PATCH 01/10] Update deploy scripts --- ui-android/build-sdk.sh | 3 ++- ui-android/publish-sdk.sh | 19 +++++++++++++++---- ui-android/sdk | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ui-android/build-sdk.sh b/ui-android/build-sdk.sh index 2ea78cf7..f30eb18f 100755 --- a/ui-android/build-sdk.sh +++ b/ui-android/build-sdk.sh @@ -10,8 +10,9 @@ source "$REPO_ROOT/helpers/common.sh" cd "$SCRIPT_DIR/sdk" ./gradlew :library:build + # Update package version in gradle build file package_version="$(get_version androidUIVersion)" gradle_path="./library/build.gradle.kts" - perl -0pi -e "s/\\n\\s+version = \"[^\"]+\"/\\n version = \"$package_version\"/" "$gradle_path" + NEW_VERSION="$package_version" perl -0pi -e 's/(coordinates\(\s*"id\.trinsic"\s*,\s*"sdk-android-ui"\s*,\s*")[^"]*(")/$1$ENV{NEW_VERSION}$2/g' $gradle_path echo "Gradle file updated with version $package_version." ) diff --git a/ui-android/publish-sdk.sh b/ui-android/publish-sdk.sh index a53b71ab..06fa035e 100755 --- a/ui-android/publish-sdk.sh +++ b/ui-android/publish-sdk.sh @@ -8,10 +8,13 @@ source "$REPO_ROOT/helpers/common.sh" require_env SDK_REPOSITORY_PATH require_env MEWMBA_GIT_PUBLISH_TOKEN +require_env ORG_GRADLE_PROJECT_mavenCentralUsername +require_env ORG_GRADLE_PROJECT_mavenCentralPassword +require_env ORG_GRADLE_PROJECT_signingInMemoryKey +require_env ORG_GRADLE_PROJECT_signingInMemoryKeyPassword +# Commit updated build.gradle.kts, tag the commit, and push ( - cd "$SCRIPT_DIR/sdk" - git config --global user.name "github-actions[bot]" git config --global user.email "github-actions[bot]@users.noreply.github.com" @@ -34,11 +37,13 @@ require_env MEWMBA_GIT_PUBLISH_TOKEN echo "Pushing to submodule repository" git push origin main - tag_name="$package_version" - git tag "$tag_name" + # Don't tag so we don't trigger Jitpack (testing) + # tag_name="$package_version" + # git tag "$tag_name" git push origin "$tag_name" ) +# Push updated submodule ref to root repo ( cd "$REPO_ROOT" remote_origin="https://$MEWMBA_GIT_PUBLISH_TOKEN@github.com/$SDK_REPOSITORY_PATH.git" @@ -49,3 +54,9 @@ require_env MEWMBA_GIT_PUBLISH_TOKEN git commit -m "Update ui-android submodule reference to version $(get_version androidUIVersion)" git push origin main ) + +# Publish to Maven +( + cd "$_SCRIPT_DIR/sdk" + ./gradlew publishToMavenCentral +) \ No newline at end of file diff --git a/ui-android/sdk b/ui-android/sdk index ea14cffc..338fbd09 160000 --- a/ui-android/sdk +++ b/ui-android/sdk @@ -1 +1 @@ -Subproject commit ea14cffc50099a088dc1e076dce5168c77bb75db +Subproject commit 338fbd09c25da341979367260c1807fc6f082cac From 71892fd1f33d3d45890ad008fb627e86c80f8da3 Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 14:45:46 -0400 Subject: [PATCH 02/10] Bump version --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 94625932..ad5969af 100644 --- a/versions.json +++ b/versions.json @@ -8,7 +8,7 @@ "phpPatchVersion": "2-preview1", "rubyPatchVersion": "2-preview", "swiftUIVersion": "2.1.0-alpha4", - "androidUIVersion": "2.1.0-alpha1", + "androidUIVersion": "2.1.0-alpha2", "flutterUIVersion": "2.0.0", "expoUIVersion": "2.0.1", "webUIVersion": "3.0.3" From 8b1d63852d2452cdee8915fd976896025a4e2468 Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 14:52:24 -0400 Subject: [PATCH 03/10] Set environment variables --- .github/workflows/ui-android-action.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ui-android-action.yml b/.github/workflows/ui-android-action.yml index 9d726c3c..1a5272d9 100644 --- a/.github/workflows/ui-android-action.yml +++ b/.github/workflows/ui-android-action.yml @@ -36,3 +36,7 @@ jobs: env: MEWMBA_GIT_PUBLISH_TOKEN: ${{ secrets.MEWMBA_GIT_PUBLISH_TOKEN }} SDK_REPOSITORY_PATH: ${{ github.repository }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_PUBLISHING_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PUBLISHING_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY_PASSWORD }} From dbb424b36e59c00790500464557daee5e3b9b063 Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 15:00:55 -0400 Subject: [PATCH 04/10] Fix publish script & temporarily remove sample from build pipeline for speed --- .github/workflows/ui-android-action.yml | 6 +++--- ui-android/publish-sdk.sh | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ui-android-action.yml b/.github/workflows/ui-android-action.yml index 1a5272d9..82d57b9a 100644 --- a/.github/workflows/ui-android-action.yml +++ b/.github/workflows/ui-android-action.yml @@ -26,9 +26,9 @@ jobs: - name: Build SDK run: ./ui-android/build-sdk.sh shell: bash - - name: Build sample - run: ./ui-android/build-samples.sh - shell: bash + # - name: Build sample + # run: ./ui-android/build-samples.sh + # shell: bash - name: Publish SDK if: inputs.publish == true run: ./ui-android/publish-sdk.sh diff --git a/ui-android/publish-sdk.sh b/ui-android/publish-sdk.sh index 06fa035e..31f68ad9 100755 --- a/ui-android/publish-sdk.sh +++ b/ui-android/publish-sdk.sh @@ -15,6 +15,8 @@ require_env ORG_GRADLE_PROJECT_signingInMemoryKeyPassword # Commit updated build.gradle.kts, tag the commit, and push ( + cd "$SCRIPT_DIR/sdk" + git config --global user.name "github-actions[bot]" git config --global user.email "github-actions[bot]@users.noreply.github.com" From f3b800ffd0f109ab2da51b33ee7e8afcbacc8a44 Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 15:05:01 -0400 Subject: [PATCH 05/10] Disable git operations --- ui-android/publish-sdk.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ui-android/publish-sdk.sh b/ui-android/publish-sdk.sh index 31f68ad9..68852312 100755 --- a/ui-android/publish-sdk.sh +++ b/ui-android/publish-sdk.sh @@ -28,33 +28,33 @@ require_env ORG_GRADLE_PROJECT_signingInMemoryKeyPassword git checkout main git pull - echo "Adding files to git" - git add . + # echo "Adding files to git" + # git add . - package_version="$(get_version androidUIVersion)" + # package_version="$(get_version androidUIVersion)" - echo "Committing files" - git commit -m "Publishing latest ui-android package for version $package_version" + # echo "Committing files" + # git commit -m "Publishing latest ui-android package for version $package_version" - echo "Pushing to submodule repository" - git push origin main + # echo "Pushing to submodule repository" + # git push origin main # Don't tag so we don't trigger Jitpack (testing) # tag_name="$package_version" # git tag "$tag_name" - git push origin "$tag_name" + # git push origin "$tag_name" ) # Push updated submodule ref to root repo ( - cd "$REPO_ROOT" - remote_origin="https://$MEWMBA_GIT_PUBLISH_TOKEN@github.com/$SDK_REPOSITORY_PATH.git" - echo "Setting origin to $remote_origin" - git remote set-url origin "$remote_origin" + # cd "$REPO_ROOT" + # remote_origin="https://$MEWMBA_GIT_PUBLISH_TOKEN@github.com/$SDK_REPOSITORY_PATH.git" + # echo "Setting origin to $remote_origin" + # git remote set-url origin "$remote_origin" - git add "ui-android/sdk" - git commit -m "Update ui-android submodule reference to version $(get_version androidUIVersion)" - git push origin main + # git add "ui-android/sdk" + # git commit -m "Update ui-android submodule reference to version $(get_version androidUIVersion)" + # git push origin main ) # Publish to Maven From 3412857d1e0a49dfe56e69f946d5fa1cc43c5a5d Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 15:08:54 -0400 Subject: [PATCH 06/10] Fix remaining issues --- ui-android/publish-sdk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui-android/publish-sdk.sh b/ui-android/publish-sdk.sh index 68852312..c809e47f 100755 --- a/ui-android/publish-sdk.sh +++ b/ui-android/publish-sdk.sh @@ -46,7 +46,7 @@ require_env ORG_GRADLE_PROJECT_signingInMemoryKeyPassword ) # Push updated submodule ref to root repo -( +# ( # cd "$REPO_ROOT" # remote_origin="https://$MEWMBA_GIT_PUBLISH_TOKEN@github.com/$SDK_REPOSITORY_PATH.git" # echo "Setting origin to $remote_origin" @@ -55,10 +55,10 @@ require_env ORG_GRADLE_PROJECT_signingInMemoryKeyPassword # git add "ui-android/sdk" # git commit -m "Update ui-android submodule reference to version $(get_version androidUIVersion)" # git push origin main -) +# ) # Publish to Maven ( - cd "$_SCRIPT_DIR/sdk" + # cd "$SCRIPT_DIR/sdk" ./gradlew publishToMavenCentral ) \ No newline at end of file From a4117a73b167d29dd889d1c4311c844f110f9d32 Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 15:13:00 -0400 Subject: [PATCH 07/10] Perhaps --- ui-android/publish-sdk.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui-android/publish-sdk.sh b/ui-android/publish-sdk.sh index c809e47f..8ae6248d 100755 --- a/ui-android/publish-sdk.sh +++ b/ui-android/publish-sdk.sh @@ -59,6 +59,6 @@ require_env ORG_GRADLE_PROJECT_signingInMemoryKeyPassword # Publish to Maven ( - # cd "$SCRIPT_DIR/sdk" + cd "$SCRIPT_DIR/sdk" ./gradlew publishToMavenCentral ) \ No newline at end of file From 54ea53fca7e82ac29970260ca97a9e7a2a982c7f Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 16:36:22 -0400 Subject: [PATCH 08/10] Reference local --- ui-android/samples/android_sample/app/build.gradle.kts | 2 +- ui-android/samples/android_sample/settings.gradle.kts | 3 --- ui-android/sdk | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ui-android/samples/android_sample/app/build.gradle.kts b/ui-android/samples/android_sample/app/build.gradle.kts index 1fbfeb27..06b112d5 100644 --- a/ui-android/samples/android_sample/app/build.gradle.kts +++ b/ui-android/samples/android_sample/app/build.gradle.kts @@ -44,5 +44,5 @@ dependencies { testImplementation(libs.junit) androidTestImplementation(libs.ext.junit) androidTestImplementation(libs.espresso.core) - implementation("com.github.trinsic-id:sdk-android-ui:2.1.0-alpha1") + implementation("id.trinsic:sdk-android-ui:2.1.0-alpha2") } \ No newline at end of file diff --git a/ui-android/samples/android_sample/settings.gradle.kts b/ui-android/samples/android_sample/settings.gradle.kts index c8f49f9c..10765451 100644 --- a/ui-android/samples/android_sample/settings.gradle.kts +++ b/ui-android/samples/android_sample/settings.gradle.kts @@ -18,9 +18,6 @@ dependencyResolutionManagement { repositories { google() mavenCentral() - maven { - url = URI("https://jitpack.io") - } } } diff --git a/ui-android/sdk b/ui-android/sdk index 338fbd09..01cee1f8 160000 --- a/ui-android/sdk +++ b/ui-android/sdk @@ -1 +1 @@ -Subproject commit 338fbd09c25da341979367260c1807fc6f082cac +Subproject commit 01cee1f87909fe1f49fbda82594ec8a41c53d63f From bcdf518f8e32699b73a791214a8939f9d08bf214 Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 16:37:52 -0400 Subject: [PATCH 09/10] Re-add sample --- .github/workflows/ui-android-action.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ui-android-action.yml b/.github/workflows/ui-android-action.yml index 82d57b9a..1a5272d9 100644 --- a/.github/workflows/ui-android-action.yml +++ b/.github/workflows/ui-android-action.yml @@ -26,9 +26,9 @@ jobs: - name: Build SDK run: ./ui-android/build-sdk.sh shell: bash - # - name: Build sample - # run: ./ui-android/build-samples.sh - # shell: bash + - name: Build sample + run: ./ui-android/build-samples.sh + shell: bash - name: Publish SDK if: inputs.publish == true run: ./ui-android/publish-sdk.sh From ef2f51dacb99b2fdd03ec5f58b9a979b21999840 Mon Sep 17 00:00:00 2001 From: Joshua Coffey Date: Tue, 5 May 2026 16:43:44 -0400 Subject: [PATCH 10/10] Bump version --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index fc9469e8..f266ff27 100644 --- a/versions.json +++ b/versions.json @@ -8,7 +8,7 @@ "phpPatchVersion": "0-preview1", "rubyPatchVersion": "0-preview1", "swiftUIVersion": "2.1.0-alpha4", - "androidUIVersion": "2.1.0-alpha2", + "androidUIVersion": "2.1.0", "flutterUIVersion": "2.0.0", "expoUIVersion": "2.0.1", "webUIVersion": "3.0.3"