From 8076fc76800e5a05916572317802ea58f097e31a Mon Sep 17 00:00:00 2001 From: Kapusch <9576733+Kapusch@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:54:02 +0200 Subject: [PATCH 1/2] ci(android): trust the pinned Linux aapt2 artifact --- .../Native/Android/gradle/verification-metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Kapusch.TikTokApisForAndroidComponents/Native/Android/gradle/verification-metadata.xml b/src/Kapusch.TikTokApisForAndroidComponents/Native/Android/gradle/verification-metadata.xml index 00ffc1b..c874c69 100644 --- a/src/Kapusch.TikTokApisForAndroidComponents/Native/Android/gradle/verification-metadata.xml +++ b/src/Kapusch.TikTokApisForAndroidComponents/Native/Android/gradle/verification-metadata.xml @@ -464,6 +464,9 @@ + + + From d9dbec89e76ee41ecf69d540ec60ecb91b8ba5cd Mon Sep 17 00:00:00 2001 From: Kapusch <9576733+Kapusch@users.noreply.github.com> Date: Wed, 15 Jul 2026 23:58:18 +0200 Subject: [PATCH 2/2] ci(android): use portable package validation tools --- scripts/validate-package.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/validate-package.sh b/scripts/validate-package.sh index 6268bea..3dbfccd 100755 --- a/scripts/validate-package.sh +++ b/scripts/validate-package.sh @@ -15,13 +15,13 @@ for expected in \ "android/aar/tiktok-open-sdk-share-2.3.1.aar" \ "buildTransitive/Kapusch.TikTok.Android.props" \ "buildTransitive/Kapusch.TikTok.Android.targets"; do - if ! rg -Fxq "$expected" <<<"$entries"; then + if ! grep -Fxq "$expected" <<<"$entries"; then echo "Missing package entry: $expected" >&2 exit 1 fi done -if rg -q "tiktok-open-sdk-auth|TikTokAuth" <<<"$entries"; then +if grep -Eq "tiktok-open-sdk-auth|TikTokAuth" <<<"$entries"; then echo "Unexpected TikTok Auth module in Share package." >&2 exit 1 fi @@ -30,13 +30,12 @@ tmp_dir="$(mktemp -d)" trap 'rm -rf "$tmp_dir"' EXIT unzip -q "$package" "android/aar/*.aar" -d "$tmp_dir" unzip -p "$tmp_dir/android/aar/ktk-tiktokinterop-release.aar" AndroidManifest.xml > "$tmp_dir/wrapper-manifest.xml" -rg -q 'TikTokShareActivity' "$tmp_dir/wrapper-manifest.xml" -rg -q '\$\{tiktokClientKey\}' "$tmp_dir/wrapper-manifest.xml" +grep -Fq 'TikTokShareActivity' "$tmp_dir/wrapper-manifest.xml" +grep -Fq '${tiktokClientKey}' "$tmp_dir/wrapper-manifest.xml" unzip -p "$tmp_dir/android/aar/tiktok-open-sdk-share-2.3.1.aar" classes.jar > "$tmp_dir/share-classes.jar" -jar tf "$tmp_dir/share-classes.jar" | rg -q '^com/tiktok/open/sdk/share/ShareApi.class$' +jar tf "$tmp_dir/share-classes.jar" | grep -Eq '^com/tiktok/open/sdk/share/ShareApi.class$' -rg -q 'v2\.3\.1' "$repo_root/DependencyLocks/Android/lockstate.txt" +grep -Eq 'v2\.3\.1' "$repo_root/DependencyLocks/Android/lockstate.txt" verification="$repo_root/src/Kapusch.TikTokApisForAndroidComponents/Native/Android/gradle/verification-metadata.xml" -rg -q '