Skip to content

Commit c6bb5e4

Browse files
Revert "feat: Add PaymentExtension-to-Mono-Repo" (#777)
Revert "feat: Add PaymentExtension-to-Mono-Repo (#776)" This reverts commit 57085c0.
1 parent 57085c0 commit c6bb5e4

31 files changed

Lines changed: 17 additions & 2263 deletions

.github/workflows/build-kits.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,15 @@ jobs:
3737
- name: Pod Lib Lint
3838
run: |
3939
echo "Linting: ${{ matrix.kit.podspec }}"
40-
INCLUDES=""
41-
if [ "${{ matrix.kit.pod_lint_standalone }}" != "true" ]; then
42-
INCLUDES="mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK-ObjC.podspec,mParticle-Apple-SDK.podspec"
43-
fi
40+
INCLUDES="mParticle-Apple-SDK-Swift.podspec,mParticle-Apple-SDK-ObjC.podspec,mParticle-Apple-SDK.podspec"
4441
if [ -n "${{ matrix.kit.pod_lint_include_podspecs }}" ]; then
45-
if [ -n "$INCLUDES" ]; then
46-
INCLUDES="${INCLUDES},${{ matrix.kit.pod_lint_include_podspecs }}"
47-
else
48-
INCLUDES="${{ matrix.kit.pod_lint_include_podspecs }}"
49-
fi
50-
fi
51-
INCLUDE_ARGS=()
52-
if [ -n "$INCLUDES" ]; then
53-
INCLUDE_ARGS=(--include-podspecs="{${INCLUDES}}")
42+
INCLUDES="${INCLUDES},${{ matrix.kit.pod_lint_include_podspecs }}"
5443
fi
44+
INCLUDES="{${INCLUDES}}"
5545
for attempt in 1 2 3; do
5646
pod lib lint "${{ matrix.kit.podspec }}" \
5747
--allow-warnings \
58-
"${INCLUDE_ARGS[@]}" \
48+
--include-podspecs="$INCLUDES" \
5949
&& break
6050
[ $attempt -lt 3 ] && echo "Attempt $attempt failed, retrying in 60s..." && sleep 60 || exit 1
6151
done

.github/workflows/release-draft.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ jobs:
9494
Kits/rokt-sdk-plus/rokt-sdk-plus-ios/Sources/RoktSDKPlus/RoktSDKPlus.swift
9595
sed -i '' 's/^let version = "[^"]*"/let version = "'"${VERSION}"'"/' \
9696
Kits/rokt-sdk-plus/rokt-sdk-plus-ios/Package.swift
97-
sed -i '' 's/^let version = "[^"]*"/let version = "'"${VERSION}"'"/' \
98-
Kits/rokt-payment-extension/rokt-payment-extension-ios/Package.swift
9997
sed -i '' "s/kLibVersion = @\"[^\"]*\"/kLibVersion = @\"${VERSION}\"/" \
10098
Kits/clevertap/clevertap-7/Sources/mParticle-CleverTap/MPKitCleverTap.m
10199
sed -i '' "s/registerPluginName:@\"mParticleKit\" version:@\"[^\"]*\"/registerPluginName:@\"mParticleKit\" version:@\"${VERSION}\"/" \
@@ -168,7 +166,7 @@ jobs:
168166
- Kit source version strings (Rokt \`kMPRoktKitVersion\`, RoktSDKPlus \`RoktSDKPlus.version\`, CleverTap \`kLibVersion\`, Branch \`registerPluginName\`)
169167
- \`Framework/Info.plist\`
170168
- Integration test mappings
171-
- Kit \`Package.swift\`: \`let version\` for \`Kits/rokt-sdk-plus/rokt-sdk-plus-ios\` and \`Kits/rokt-payment-extension/rokt-payment-extension-ios\` on every release; other kits’ \`let version\` only on **major** bumps (core SDK SPM pin)
169+
- Kit \`Package.swift\`: \`let version\` for \`Kits/rokt-sdk-plus/rokt-sdk-plus-ios\` on every release; other kits’ \`let version\` only on **major** bumps (core SDK SPM pin)
172170
173171
---
174172

.github/workflows/release-publish.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -284,11 +284,7 @@ jobs:
284284
id: push
285285
run: |
286286
DEST_URL="https://x-access-token:${{ steps.generate-token.outputs.token }}@github.com/${{ env.DEST_ORG }}/${{ matrix.kit.dest_repo }}.git"
287-
if [ "${{ matrix.kit.mirror_force_push_main }}" = "true" ]; then
288-
git push --force "$DEST_URL" "split/${{ matrix.kit.name }}:main"
289-
else
290-
git push "$DEST_URL" "split/${{ matrix.kit.name }}:main"
291-
fi
287+
git push "$DEST_URL" "split/${{ matrix.kit.name }}:main"
292288
echo "sha=$(git rev-parse split/${{ matrix.kit.name }})" >> $GITHUB_OUTPUT
293289
294290
- name: Create GitHub release on mirror
@@ -393,13 +389,6 @@ jobs:
393389
. Scripts/pod_push.sh
394390
wait_for_pod_version_on_trunk mParticle-Rokt "$VERSION"
395391
396-
- name: Wait for RoktPaymentExtension on CocoaPods CDN (RoktSDKPlus)
397-
if: matrix.kit.name == 'rokt-sdk-plus-ios'
398-
run: |
399-
VERSION=$(head -n 1 VERSION | tr -d '\r\n ')
400-
. Scripts/pod_push.sh
401-
wait_for_pod_version_on_trunk RoktPaymentExtension "$VERSION"
402-
403392
- name: Publish to CocoaPods
404393
if: matrix.kit.podspec != ''
405394
env:

Kits/matrix.json

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -393,37 +393,17 @@
393393
}
394394
]
395395
},
396-
{
397-
"name": "rokt-payment-extension-ios",
398-
"local_path": "Kits/rokt-payment-extension/rokt-payment-extension-ios",
399-
"podspec": "Kits/rokt-payment-extension/rokt-payment-extension-ios/RoktPaymentExtension.podspec",
400-
"dest_repo": "rokt-payment-extension-ios",
401-
"dest_org": "ROKT",
402-
"mirror_force_push_main": true,
403-
"pod_lint_standalone": true,
404-
"spm_package_only": true,
405-
"skip_xcframework": true,
406-
"skip_example_builds": true,
407-
"schemes": [
408-
{
409-
"scheme": "RoktPaymentExtension",
410-
"module": "RoktPaymentExtension",
411-
"destination": "iOS"
412-
}
413-
]
414-
},
415396
{
416397
"name": "rokt-sdk-plus-ios",
417398
"local_path": "Kits/rokt-sdk-plus/rokt-sdk-plus-ios",
418399
"podspec": "Kits/rokt-sdk-plus/rokt-sdk-plus-ios/RoktSDKPlus.podspec",
419400
"dest_repo": "rokt-sdk-plus-ios",
420401
"dest_org": "ROKT",
421-
"mirror_force_push_main": true,
422402
"spm_package_only": true,
423403
"skip_xcframework": true,
424404
"skip_example_builds": true,
425405
"skip_spm_tests": true,
426-
"pod_lint_include_podspecs": "Kits/rokt/rokt/mParticle-Rokt.podspec,Kits/rokt-payment-extension/rokt-payment-extension-ios/RoktPaymentExtension.podspec",
406+
"pod_lint_include_podspecs": "Kits/rokt/rokt/mParticle-Rokt.podspec",
427407
"schemes": [
428408
{
429409
"scheme": "RoktSDKPlus",

Kits/rokt-payment-extension/rokt-payment-extension-ios/.gitignore

Lines changed: 0 additions & 40 deletions
This file was deleted.

Kits/rokt-payment-extension/rokt-payment-extension-ios/.markdownlint.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

Kits/rokt-payment-extension/rokt-payment-extension-ios/.swiftformat

Lines changed: 0 additions & 117 deletions
This file was deleted.

Kits/rokt-payment-extension/rokt-payment-extension-ios/.swiftlint.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

Kits/rokt-payment-extension/rokt-payment-extension-ios/.yamllint.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

Kits/rokt-payment-extension/rokt-payment-extension-ios/LICENSE.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)