From e4c222a4e845b378ebdc289aad8437d59c42c744 Mon Sep 17 00:00:00 2001 From: Hugh Nimmo-Smith Date: Mon, 31 Mar 2025 14:55:20 +0100 Subject: [PATCH] Expose version string in embedded SwiftPM and AAR (#3144) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Expose version string in embedded SwiftPM and AAR Implements https://github.com/element-hq/element-call/issues/3143 * Fix filename * Fix location of `Version.kt` * Use the right path for the sed replacement in the publishing workflow for Android --------- Co-authored-by: Jorge Martín --- .github/workflows/publish-embedded-packages.yaml | 12 +++++++++--- .../io/element/android/call/embedded/Version.kt | 8 ++++++++ .../EmbeddedElementCall/EmbeddedElementCall.swift | 9 +++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 embedded/android/lib/src/main/kotlin/io/element/android/call/embedded/Version.kt diff --git a/.github/workflows/publish-embedded-packages.yaml b/.github/workflows/publish-embedded-packages.yaml index 4182d488..45896a59 100644 --- a/.github/workflows/publish-embedded-packages.yaml +++ b/.github/workflows/publish-embedded-packages.yaml @@ -124,6 +124,9 @@ jobs: - name: Get artifact version run: echo "ARTIFACT_VERSION=${VERSION:1}" >> "$GITHUB_ENV" + - name: Set version string + run: sed -i "s/0.0.0/${{ env.ARTIFACT_VERSION }}/g" embedded/android/lib/src/main/kotlin/io/element/android/call/embedded/Version.kt + - name: Publish AAR working-directory: embedded/android env: @@ -165,13 +168,16 @@ jobs: - name: Copy files run: rsync -a --delete --exclude .git element-call/embedded/ios/ element-call-swift + - name: Get artifact version + run: echo "ARTIFACT_VERSION=${VERSION:1}" >> "$GITHUB_ENV" + + - name: Set version string + run: sed -i "s/0.0.0/${{ env.ARTIFACT_VERSION }}/g" element-call-swift/Sources/EmbeddedElementCall/EmbeddedElementCall.swift + - name: Test build working-directory: element-call-swift run: swift build - - name: Get artifact version - run: echo "ARTIFACT_VERSION=${VERSION:1}" >> "$GITHUB_ENV" - - name: Commit and tag working-directory: element-call-swift run: | diff --git a/embedded/android/lib/src/main/kotlin/io/element/android/call/embedded/Version.kt b/embedded/android/lib/src/main/kotlin/io/element/android/call/embedded/Version.kt new file mode 100644 index 00000000..ab8bf8de --- /dev/null +++ b/embedded/android/lib/src/main/kotlin/io/element/android/call/embedded/Version.kt @@ -0,0 +1,8 @@ +/* + * Copyright 2025 New Vector Ltd. + * + * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial + * Please see LICENSE files in the repository root for full details. + */ + +const val VERSION = "0.0.0" diff --git a/embedded/ios/Sources/EmbeddedElementCall/EmbeddedElementCall.swift b/embedded/ios/Sources/EmbeddedElementCall/EmbeddedElementCall.swift index 9cbd3f67..80e1022d 100644 --- a/embedded/ios/Sources/EmbeddedElementCall/EmbeddedElementCall.swift +++ b/embedded/ios/Sources/EmbeddedElementCall/EmbeddedElementCall.swift @@ -1,5 +1,14 @@ +// +// Copyright 2025 New Vector Ltd. +// +// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial +// Please see LICENSE files in the repository root for full details. +// + import Foundation public let appURL = Bundle.module.url(forResource: "index", withExtension: "html", subdirectory: "dist") public let bundle = Bundle.module + +public let version = "0.0.0"