Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate PrebidMobile Documentation #1034

Merged
merged 38 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
f1d5084
feat: add jazzy configuration
OlenaPostindustria Aug 5, 2024
d433346
feat: update settings
OlenaPostindustria Aug 5, 2024
0900adc
feat: update settings
OlenaPostindustria Aug 5, 2024
de0a4d2
feat: update .circleci/config.yml
OlenaPostindustria Aug 6, 2024
79485af
feat: update .circleci/config.yml
OlenaPostindustria Aug 6, 2024
fc8bfdc
feat: update .circleci/config.yml
OlenaPostindustria Aug 6, 2024
de9d78c
feat: update .circleci/config.yml
OlenaPostindustria Aug 6, 2024
0f991ca
feat: update
OlenaPostindustria Aug 6, 2024
5842011
feat: add doc in comments
OlenaPostindustria Aug 8, 2024
2fde830
feat: update doc
OlenaPostindustria Aug 8, 2024
f636b84
feat: update README.md
OlenaPostindustria Aug 9, 2024
497e373
feat: add upload-docs.yml
OlenaPostindustria Aug 21, 2024
41a1c77
feat: update config
OlenaPostindustria Aug 21, 2024
6f15c05
feat: update config
OlenaPostindustria Aug 21, 2024
ac2f91e
feat: update config
OlenaPostindustria Aug 21, 2024
27f08ea
feat: update config
OlenaPostindustria Aug 21, 2024
eb5e0fe
feat: update config
OlenaPostindustria Aug 21, 2024
0a35333
feat: update upload-docs-ios.yml
OlenaPostindustria Aug 22, 2024
681ffeb
feat: update upload-docs-ios.yml
OlenaPostindustria Aug 22, 2024
fa64e19
feat: update upload-docs-ios.yml
OlenaPostindustria Aug 22, 2024
e0642d5
feat: update upload-docs-ios.yml
OlenaPostindustria Aug 22, 2024
9ef5dc9
doc: use specific README
Sep 23, 2024
5c1510e
doc: update the Overview page
Sep 23, 2024
ee668bc
doc: small change to fix build
Sep 23, 2024
ed5a62c
doc: small change to fix the build
Sep 23, 2024
8e565f1
Revert "doc: small change to fix build"
Sep 24, 2024
2982e86
Revert "doc: small change to fix the build"
Sep 24, 2024
c944a3a
feat: update upload-docs-ios.yml
OlenaPostindustria Sep 24, 2024
bd83ce7
feat: update upload-docs-ios.yml
OlenaPostindustria Sep 24, 2024
3848ce6
doc: update README
OlenaPostindustria Sep 24, 2024
3189eec
doc: update README
OlenaPostindustria Sep 24, 2024
78d3628
fix build
Sep 24, 2024
e62df82
fix: update supported GMA SDK version
Sep 24, 2024
b340d61
fix test
Sep 24, 2024
2b332e4
fix tests
Sep 25, 2024
630602e
tests: clean build before running unit tests
Sep 25, 2024
3ca7cab
feat: add check for operation with docs_new directory
OlenaPostindustria Sep 26, 2024
c6dff08
feat: update workflow to abort if conditions are not met
OlenaPostindustria Sep 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
name: Run Smoke UI Tests
command: scripts/testPrebidDemo.sh -ui -l


workflows:
pr-check:
jobs:
Expand Down
58 changes: 58 additions & 0 deletions .github/workflows/upload-docs-ios.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Upload Docs iOS

on:
push:
tags:
- '[0-9]+.[0-9]+.[0-9]+'
- 'test-doc-*'

jobs:
upload-docs:

runs-on: macos-latest

steps:
- name: Checkout current branch
uses: actions/checkout@v4
- name: Install Jazzy
run: |
gem install jazzy
- name: Generate docs
run: |
jazzy
cp -r docs docs_new
- name: Checkout docs branch
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: docs
clean: false
YuriyVelichkoPI marked this conversation as resolved.
Show resolved Hide resolved
- name: Commit documentation changes
run: |
MIN_SIZE=5120
if [ -d docs_new ] && [ "$(du -s docs_new | cut -f1)" -ge "$MIN_SIZE" ]; then
rm -rf docs
cp -r docs_new docs
rm -rf docs_new
else
echo "docs_new directory either does not exist or is too small."
exit 1
fi

if [ "$(git status --porcelain | wc -l)" -gt 0 ]; then
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
git status
TAG_NAME=${{ github.ref }}
TAG_NAME=${TAG_NAME#refs/tags/}
echo "Current tag: $TAG_NAME"
git add docs
git commit -m "Generate docs - $TAG_NAME"
else
echo "No changes to commit."
fi
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: docs
63 changes: 63 additions & 0 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Ordered by output of `jazzy — help config`
output: docs
clean: true
xcodebuild_arguments:
- -workspace
- PrebidMobile.xcworkspace
- -scheme
- PrebidMobile
- CODE_SIGNING_ALLOWED = NO
author: Prebid
readme: README_API_DOC.md
exclude:
- PrebidMobile/Addendum/*
- PrebidMobile/AdUnits/BannerBasedAdUnitProtocol.swift
- PrebidMobile/AdUnits/VideoBasedAdUnitProtocol.swift
- PrebidMobile/CacheManagement/*
- PrebidMobile/ConfigurationAndTargeting/AgeUtils.swift
- PrebidMobile/ConfigurationAndTargeting/ClickbrowserType.swift
- PrebidMobile/ConfigurationAndTargeting/PrebidGAMVersionChecker.swift
- PrebidMobile/ConfigurationAndTargeting/PrebidSDKInitializer.swift
- PrebidMobile/ConfigurationAndTargeting/PrebidServerStatusRequester.swift
- PrebidMobile/ConfigurationAndTargeting/UserConsentDataManager.swift
- PrebidMobile/Constants.swift
- PrebidMobile/Dispatcher.swift
- PrebidMobile/ImageHelper.swift
- PrebidMobile/JSONConvertible.swift
- PrebidMobile/JsonDecodable.swift
- PrebidMobile/Logging/*
- PrebidMobile/StorageUtils.swift
- PrebidMobile/Tracker*
- PrebidMobile/UIViewExtension.swift
- PrebidMobile/Utils/*
- PrebidMobile/PrebidMobileRendering/AdTypes/AdView/AdConfiguration.swift
- PrebidMobile/PrebidMobileRendering/AdTypes/AdView/AdViewButtonDecorator.swift
- PrebidMobile/PrebidMobileRendering/AdTypes/AdView/HiddenWebViewManager.swift
- PrebidMobile/PrebidMobileRendering/Assets/PrebidImagesRepository.swift
- PrebidMobile/PrebidMobileRendering/AutoRefreshCountConfig.swift
- PrebidMobile/PrebidMobileRendering/Impression*
- PrebidMobile/PrebidMobileRendering/Networking*
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/AdLoading/AdLoadFlowControllerDelegate.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/AdLoading/BannerAdLoaderDelegate.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/BannerEventInteractionDelegate.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/BannerEventLoadingDelegate.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/InterstitialEventInteractionDelegate.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/InterstitialEventLoadingDelegate.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/RewardedEventInteractionDelegate.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/RewardedEventLoadingDelegate.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/BaseInterstitialAdUnitProtocol.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/GAM/InterstitialEventHandlerProtocol.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/MediationAPI/MediationUtils.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/MediationAPI/MediationNativeUtils.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/MediationAPI/MediationConstants.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/MediationAPI/MediationBidInfoWrapper.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/PBMStandaloneSDK/DemandResponseInfo.swift
- PrebidMobile/PrebidMobileRendering/Prebid/Integrations/PBMStandaloneSDK/EventHandlers/*
- PrebidMobile/PrebidMobileRendering/Prebid/PBMCore/*
- PrebidMobile/PrebidMobileRendering/Prebid/PBMCacheRenderers/*
- PrebidMobile/PrebidMobileRendering/PrebidServerEventTracker.swift
- PrebidMobile/PrebidMobileRendering/ServerEvent.swift
- PrebidMobile/PrebidMobileRendering/ServerSideConfiguration/*
- PrebidMobile/PrebidMobileRendering/Skadn*
- PrebidMobile/PrebidMobileRendering/Utilities/*
theme: apple
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public class PrebidAdMobMediationBaseAdapter: NSObject, GADMediationAdapter {

// Added for tests
static func latestTestedGMAVersion() -> GADVersionNumber {
return GADVersionNumber(majorVersion: 11, minorVersion: 8, patchVersion: 0)
return GADVersionNumber(majorVersion: 11, minorVersion: 10, patchVersion: 0)
}

required public override init() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class GAMUtils: NSObject {

// Added for tests
static func latestTestedGMAVersion() -> GADVersionNumber {
return GADVersionNumber(majorVersion: 11, minorVersion: 8, patchVersion: 0)
return GADVersionNumber(majorVersion: 11, minorVersion: 10, patchVersion: 0)
}

// MARK: Private Methods
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public class PrebidMAXMediationAdapter: ALMediationAdapter {
// TODO: Add Prebid SDK initialization logic

completionHandler(.initializedUnknown, nil)
Targeting.shared.subjectToCOPPA = ALPrivacySettings.isAgeRestrictedUser()
}

public override var sdkVersion: String {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class PrebidAdMobBannerViewController:
// imp[].ext.data
if let adUnitContext = AppConfiguration.shared.adUnitContext {
for dataPair in adUnitContext {
adUnit?.addContextData(dataPair.value, forKey: dataPair.key)
adUnit?.addContextData(key: dataPair.value, value: dataPair.key)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class PrebidAdMobInterstitialViewController: NSObject, AdaptedController, Prebid
// imp[].ext.data
if let adUnitContext = AppConfiguration.shared.adUnitContext {
for dataPair in adUnitContext {
adUnit?.addContextData(dataPair.value, forKey: dataPair.key)
adUnit?.addContextData(key: dataPair.value, value: dataPair.key)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class PrebidAdMobNativeViewController: NSObject, AdaptedController, GADNativeAdL
// imp[].ext.data
if let adUnitContext = AppConfiguration.shared.adUnitContext {
for dataPair in adUnitContext {
nativeAdUnit?.addContextData(dataPair.value, forKey: dataPair.key)
nativeAdUnit?.addContextData(key: dataPair.value, value: dataPair.key)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class PrebidAdMobRewardedViewController: NSObject, AdaptedController, PrebidConf
// imp[].ext.data
if let adUnitContext = AppConfiguration.shared.adUnitContext {
for dataPair in adUnitContext {
adUnit?.addContextData(dataPair.value, forKey: dataPair.key)
adUnit?.addContextData(key: dataPair.value, value: dataPair.key)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class PrebidMAXBannerController: NSObject, AdaptedController, PrebidConfigurable
// imp[].ext.data
if let adUnitContext = AppConfiguration.shared.adUnitContext {
for dataPair in adUnitContext {
adUnit?.addContextData(dataPair.value, forKey: dataPair.key)
adUnit?.addContextData(key: dataPair.value, value: dataPair.key)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class PrebidMAXInterstitialController: NSObject, AdaptedController, PrebidConfig
// imp[].ext.data
if let adUnitContext = AppConfiguration.shared.adUnitContext {
for dataPair in adUnitContext {
adUnit?.addContextData(dataPair.value, forKey: dataPair.key)
adUnit?.addContextData(key: dataPair.value, value: dataPair.key)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class PrebidMAXNativeController: NSObject, AdaptedController {
// imp[].ext.data
if let adUnitContext = AppConfiguration.shared.adUnitContext {
for dataPair in adUnitContext {
nativeAdUnit?.addContextData(dataPair.value, forKey: dataPair.key)
nativeAdUnit?.addContextData(key: dataPair.value, value: dataPair.key)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class PrebidMAXRewardedController: NSObject, AdaptedController, PrebidConfigurab
// imp[].ext.data
if let adUnitContext = AppConfiguration.shared.adUnitContext {
for dataPair in adUnitContext {
adUnit?.addContextData(dataPair.value, forKey: dataPair.key)
adUnit?.addContextData(key: dataPair.value, value: dataPair.key)
}
}

Expand Down
12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PODS:
- Alamofire (4.9.1)
- AppLovinSDK (12.6.1)
- AppLovinSDK (13.0.0)
- Eureka (5.5.0)
- Google-Mobile-Ads-SDK (11.8.0):
- Google-Mobile-Ads-SDK (11.10.0):
- GoogleUserMessagingPlatform (>= 1.1)
- GoogleAds-IMA-iOS-SDK (3.23.0)
- GoogleUserMessagingPlatform (2.5.0)
- GoogleUserMessagingPlatform (2.6.0)
- RxSwift (6.7.1)
- SVProgressHUD (2.3.1):
- SVProgressHUD/Core (= 2.3.1)
Expand Down Expand Up @@ -33,11 +33,11 @@ SPEC REPOS:

SPEC CHECKSUMS:
Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
AppLovinSDK: a892bbeff744749a8121bd863aa1399f7eef6ef1
AppLovinSDK: c0ecb434df24008b6ecdd7f1e5b8587bc45ff381
Eureka: 1c18c7fcd8f772cc2ca42d6be36292dffa77eecb
Google-Mobile-Ads-SDK: c1c53687b572122c5b0bdaf354335bbf40fd81ef
Google-Mobile-Ads-SDK: 13e6e98edfd78ad8d8a791edb927658cc260a56f
GoogleAds-IMA-iOS-SDK: ee2a68ed7a1a17c7bb81bdb1b81590b35a3fc8f3
GoogleUserMessagingPlatform: 6b4f48a370e77ce121d034c908cc6ee4fdafaf13
GoogleUserMessagingPlatform: 0c3a08353e53ce8c2feab7addd0b652cde522450
RxSwift: b9a93a26031785159e11abd40d1a55bcb8057e52
SVProgressHUD: 4837c74bdfe2e51e8821c397825996a8d7de6e22

Expand Down
8 changes: 8 additions & 0 deletions PrebidMobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
53A657B12A8B650900AE0B4F /* PBMORTBSDKConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A657AE2A8B64B300AE0B4F /* PBMORTBSDKConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
53A657B52A8B8B0500AE0B4F /* PBMORTBBidResponseExtPrebid.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A657B42A8B8B0500AE0B4F /* PBMORTBBidResponseExtPrebid.h */; settings = {ATTRIBUTES = (Public, ); }; };
53A657B72A8B8B6400AE0B4F /* PBMORTBBidResponseExtPrebid.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A657B62A8B8B6400AE0B4F /* PBMORTBBidResponseExtPrebid.m */; };
53A8CBDB2C64D12A008ABEA7 /* SingleContainerInt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53A8CBDA2C64D12A008ABEA7 /* SingleContainerInt.swift */; };
53B221CF2A0E3D2800C91CCB /* PrebidJSLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B221CE2A0E3D2800C91CCB /* PrebidJSLibrary.swift */; };
53B221D12A0E3D3D00C91CCB /* PrebidJSLibraryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B221D02A0E3D3D00C91CCB /* PrebidJSLibraryManager.swift */; };
53B221D32A0E3DA900C91CCB /* PrebidJSLibraryManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 53B221D22A0E3DA900C91CCB /* PrebidJSLibraryManagerTests.swift */; };
Expand Down Expand Up @@ -967,6 +968,7 @@
53A657AF2A8B64C200AE0B4F /* PBMORTBSDKConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PBMORTBSDKConfiguration.m; sourceTree = "<group>"; };
53A657B42A8B8B0500AE0B4F /* PBMORTBBidResponseExtPrebid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PBMORTBBidResponseExtPrebid.h; sourceTree = "<group>"; };
53A657B62A8B8B6400AE0B4F /* PBMORTBBidResponseExtPrebid.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PBMORTBBidResponseExtPrebid.m; sourceTree = "<group>"; };
53A8CBDA2C64D12A008ABEA7 /* SingleContainerInt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleContainerInt.swift; sourceTree = "<group>"; };
53B221CE2A0E3D2800C91CCB /* PrebidJSLibrary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidJSLibrary.swift; sourceTree = "<group>"; };
53B221D02A0E3D3D00C91CCB /* PrebidJSLibraryManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidJSLibraryManager.swift; sourceTree = "<group>"; };
53B221D22A0E3DA900C91CCB /* PrebidJSLibraryManagerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrebidJSLibraryManagerTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1909,6 +1911,7 @@
53E45A0227FCD09C0095C0B2 /* BannerParameters.swift */,
53E3910D27FCD60800DBA2F7 /* VideoParameters.swift */,
53A368EA2AB2E95E00A03B3E /* NativeParameters.swift */,
53A8CBDA2C64D12A008ABEA7 /* SingleContainerInt.swift */,
);
path = Parameters;
sourceTree = "<group>";
Expand Down Expand Up @@ -4194,6 +4197,7 @@
5BC3792B271F1D0000444D5E /* PBMConstants.m in Sources */,
5BC37A61271F1D0000444D5E /* PBMORTBBidExt.m in Sources */,
FAEE4D13262DC2B200AD9966 /* AdUnit.swift in Sources */,
53A8CBDB2C64D12A008ABEA7 /* SingleContainerInt.swift in Sources */,
5BC379CF271F1D0000444D5E /* PBMAdLoadManagerBase.m in Sources */,
924F661C27FDBA5200C8DAF7 /* PBMORTBAdConfiguration.m in Sources */,
5BC379FB271F1D0000444D5E /* PBMExternalURLOpenCallbacks.m in Sources */,
Expand Down Expand Up @@ -4531,6 +4535,8 @@
MARKETING_VERSION = 2.3.0;
MODULEMAP_FILE = PrebidMobile/BuildFiles/PrebidMobile.modulemap;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -4567,6 +4573,8 @@
MARKETING_VERSION = 2.3.0;
MODULEMAP_FILE = PrebidMobile/BuildFiles/PrebidMobile.modulemap;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down
Loading