diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml index d600694..eb228e3 100644 --- a/.github/workflows/gradle-publish.yml +++ b/.github/workflows/gradle-publish.yml @@ -6,6 +6,11 @@ name: Gradle Package on: release: types: [created] + workflow_dispatch: + inputs: + version: + description: "Version to publish (e.g., v0.1.0)" + required: true jobs: publish: @@ -27,9 +32,15 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 - - name: Extract version from tag + - name: Extract version from input or tag id: version - run: echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT + shell: bash + run: | + VERSION="${{ inputs.version }}" + if [[ -z "$VERSION" ]]; then + VERSION="$GITHUB_REF_NAME" + fi + echo "version=${VERSION#v}" >> $GITHUB_OUTPUT - name: Build with Gradle working-directory: bindings/android @@ -40,6 +51,6 @@ jobs: working-directory: bindings/android env: GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.ORG_PACKAGES_TOKEN }} GITHUB_REPO: ${{ github.repository }} run: ./gradlew publish -Pversion=${{ steps.version.outputs.version }} diff --git a/bindings/android/README.md b/bindings/android/README.md index 5a47df1..b8b50bc 100644 --- a/bindings/android/README.md +++ b/bindings/android/README.md @@ -15,13 +15,12 @@ Create a GitHub PAT (Personal Access Token): Set env vars: ```sh -export GITHUB_ACTOR="your_pat_with_read" +export GITHUB_ACTOR="your_github_username" export GITHUB_TOKEN="your_pat_with_read:packages" ``` Or add to `~/.gradle/gradle.properties`: ```properties -# ~/.gradle/gradle.properties gpr.user= gpr.key= ``` @@ -31,7 +30,6 @@ gpr.key= ```kotlin // settings.gradle.kts dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() mavenCentral() @@ -56,6 +54,7 @@ dependencies { // implementation("com.synonym:bitkit-core-android:0.1.0") } ``` + ### Maven Local (development) ```kotlin diff --git a/build_android.sh b/build_android.sh index 7f7f3c1..b4b8c93 100755 --- a/build_android.sh +++ b/build_android.sh @@ -139,7 +139,7 @@ find "$TMP_DIR" -name "bitkitcore.kt" -exec mv {} "$BASE_DIR/" \; # Clean up temp directory and any remaining uniffi directories echo "Cleaning up temporary files..." rm -rf "$TMP_DIR" -rm -rf "$BASE_DIR/uniffi" +rm -rf "$ANDROID_LIB_DIR/uniffi" # Verify the file was moved correctly if [ ! -f "$BASE_DIR/bitkitcore.kt" ]; then