diff --git a/.github/workflows/release_sdk_parallel.yml b/.github/workflows/release_sdk_parallel.yml index 58269a8..c4d68cb 100644 --- a/.github/workflows/release_sdk_parallel.yml +++ b/.github/workflows/release_sdk_parallel.yml @@ -95,13 +95,9 @@ jobs: id: set_linkable_ref run: | pushd ${{ env.RUST_SDK_PATH }} - if COMMIT_HASH=$(git show-ref --verify refs/heads/${{ github.event.inputs.rust-checkout-ref }} | awk '{print $1}'); then - echo linkable_ref=$COMMIT_HASH >> $GITHUB_OUTPUT - echo "Using commit hash $COMMIT_HASH" - else - echo linkable_ref=${{ github.event.inputs.rust-checkout-ref }} >> $GITHUB_OUTPUT - echo "Using commit hash ${{ github.event.inputs.rust-checkout-ref }}" - fi + COMMIT_HASH=$(git rev-parse --verify ${{ github.event.inputs.rust-checkout-ref }}) + echo linkable_ref=$COMMIT_HASH >> $GITHUB_OUTPUT + echo "Using commit hash $COMMIT_HASH" popd - name: Upload target artifacts diff --git a/buildSrc/src/main/kotlin/BuildVersionsSDK.kt b/buildSrc/src/main/kotlin/BuildVersionsSDK.kt index 51ea70c..f410c83 100644 --- a/buildSrc/src/main/kotlin/BuildVersionsSDK.kt +++ b/buildSrc/src/main/kotlin/BuildVersionsSDK.kt @@ -1,5 +1,5 @@ object BuildVersionsSDK { const val majorVersion = 0 const val minorVersion = 2 - const val patchVersion = 23 + const val patchVersion = 24 } diff --git a/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt b/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt index 7173e58..26d8d59 100644 --- a/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt +++ b/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt @@ -29129,7 +29129,7 @@ sealed class TimelineItemContentKind: Disposable { data class Sticker( val `body`: kotlin.String, val `info`: ImageInfo, - val `url`: kotlin.String) : TimelineItemContentKind() { + val `source`: MediaSource) : TimelineItemContentKind() { companion object } @@ -29203,7 +29203,7 @@ sealed class TimelineItemContentKind: Disposable { Disposable.destroy( this.`body`, this.`info`, - this.`url`) + this.`source`) } is TimelineItemContentKind.Poll -> { @@ -29281,7 +29281,7 @@ public object FfiConverterTypeTimelineItemContentKind : FfiConverterRustBuffer TimelineItemContentKind.Sticker( FfiConverterString.read(buf), FfiConverterTypeImageInfo.read(buf), - FfiConverterString.read(buf), + FfiConverterTypeMediaSource.read(buf), ) 4 -> TimelineItemContentKind.Poll( FfiConverterString.read(buf), @@ -29344,7 +29344,7 @@ public object FfiConverterTypeTimelineItemContentKind : FfiConverterRustBuffer { @@ -29439,7 +29439,7 @@ public object FfiConverterTypeTimelineItemContentKind : FfiConverterRustBuffer {