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.

Sign up for GitHub

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

Jump to bottom

[HB-5829] Update Unity Editor Adapter Window to Use New v2 Partners JSON #130

Merged
merged 2 commits into from
May 10, 2023
Merged

[HB-5829] Update Unity Editor Adapter Window to Use New v2 Partners JSON #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694594e
Updating adapter window to use more comprenhensive json schema
SCastanedaMunoz May 9, 2023
33bd281
Only check minor versioning
SCastanedaMunoz May 9, 2023
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
2 changes: 2 additions & 0 deletions com.chartboost.mediation.demo/Assets/Demo/Editor/DisableBitcode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if UNITY_IOS
using UnityEditor;
using UnityEditor.Build;
using UnityEditor.Build.Reporting;
Expand Down Expand Up @@ -36,3 +37,4 @@ public void OnPostprocessBuild(BuildReport report)
}
}
}
#endif
3 changes: 1 addition & 2 deletions ...t.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/AdColonyDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-adcolony:4.4.8.0+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.adcolony:sdk:4.8.0"/>

</androidPackages>
<iosPods>
<!-- iOS Adapter -->
Expand Down
3 changes: 1 addition & 2 deletions ...oost.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/AdMobDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-admob:4.21.5.0+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.google.android.gms:play-services-ads:21.5.0"/>

</androidPackages>
<iosPods>
<!-- iOS Adapter -->
Expand Down
3 changes: 1 addition & 2 deletions ...o/Assets/com.chartboost.mediation/Editor/Adapters/AmazonPublisherServicesDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-amazon-publisher-services:4.9.7.1+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.amazon.android:aps-sdk:9.7.1"/>

</androidPackages>
<iosPods>
<!-- iOS Adapter -->
Expand Down
3 changes: 1 addition & 2 deletions ...t.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/AppLovinDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-applovin:4.11.8.2+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.applovin:applovin-sdk:11.8.2"/>

</androidPackages>
<iosPods>
<!-- iOS Adapter -->
Expand Down
3 changes: 1 addition & 2 deletions ...mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/ChartboostDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-chartboost:4.9.2.1+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.chartboost:chartboost-sdk:9.2.1"/>

</androidPackages>
<iosPods>
<!-- iOS Adapter -->
Expand Down
3 changes: 1 addition & 2 deletions ...mo/Assets/com.chartboost.mediation/Editor/Adapters/DigitalTurbineExchangeDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-digital-turbine-exchange:4.8.2.2+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.fyber:marketplace-sdk:8.2.2"/>

</androidPackages>
<iosPods>
<!-- iOS Adapter -->
Expand Down
3 changes: 1 addition & 2 deletions ...iation.demo/Assets/com.chartboost.mediation/Editor/Adapters/GoogleBiddingDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-google-bidding:4.21.5.0+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.google.android.gms:play-services-ads:21.5.0"/>

<androidPackage spec="com.google.guava:guava:31.1-android"/>
</androidPackages>
<iosPods>
Expand Down
17 changes: 17 additions & 0 deletions ...ost.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/HyprMXDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<dependencies>
<androidPackages>
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-hyprmx:4.6.0.3+@aar"/>

<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.hyprmx.android:HyprMX-SDK:6.0.3"/>
</androidPackages>
<iosPods>
<!-- iOS Adapter -->
<iosPod name="ChartboostMediationAdapterHyprMX" version="~> 4.6.0.0"/>

<!-- Partner iOS SDK-->
<iosPod name="HyprMX" version="~> 6.0.0" addToAllTargets="false"/>
</iosPods>
</dependencies>
7 changes: 7 additions & 0 deletions ...ediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/HyprMXDependencies.xml.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions ...ost.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/InMobiDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
<dependencies>
<androidPackages>
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-inmobi:4.10.1.3+@aar"/>
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-inmobi:4.10.5.4+@aar"/>

<!-- Partner Android SDK-->
<androidPackage spec="com.inmobi.monetization:inmobi-ads:10.1.3"/>

<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.inmobi.monetization:inmobi-ads-kotlin:10.5.4"/>
</androidPackages>
<iosPods>
<!-- iOS Adapter -->
<iosPod name="ChartboostMediationAdapterInMobi" version="~> 4.10.5.0"/>

<!-- Partner iOS SDK-->
<!-- InMobi species different SDKs based on version. Ignoring. -->
<iosPod name="InMobiSDK-Swift" version="~> 10.5.0" addToAllTargets="false"/>
</iosPods>
</dependencies>
11 changes: 5 additions & 6 deletions ...mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/IronSourceDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
<dependencies>
<androidPackages>
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-ironsource:4.7.3.0.0+@aar"/>
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-ironsource:4.7.3.0+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.ironsource.sdk:mediationsdk:7.3.0"/>

<!-- IronSource Android Repositories -->
<repositories>
<repository>https://android-sdk.is.com/</repository>
</repositories>
</androidPackages>
<iosPods>
<!-- iOS Adapter -->
<iosPod name="ChartboostMediationAdapterIronSource" version="~> 4.7.2.7.0"/>
<iosPod name="ChartboostMediationAdapterIronSource" version="~> 4.7.3.0.0"/>

<!-- Partner iOS SDK-->
<iosPod name="IronSourceSDK" version="~> 7.2.7.0" addToAllTargets="false"/>
<iosPod name="IronSourceSDK" version="~> 7.3.0.0" addToAllTargets="false"/>
</iosPods>
</dependencies>
3 changes: 1 addition & 2 deletions ....demo/Assets/com.chartboost.mediation/Editor/Adapters/MetaAudienceNetworkDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-meta-audience-network:4.6.13.7+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.facebook.android:audience-network-sdk:6.13.7"/>

</androidPackages>
<iosPods>
<!-- iOS Adapter -->
Expand Down
15 changes: 6 additions & 9 deletions ....mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/MintegralDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-mintegral:4.16.3.91+@aar"/>

<!-- Partner Android SDK-->
<!-- Mintegral does not provide a single SDK. -->

<!-- Mintegral Android Repositories -->
<repositories>
<repository>https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea</repository>
</repositories>

<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.mbridge.msdk.oversea:videojs:16.3.91"/>
<androidPackage spec="com.mbridge.msdk.oversea:mbjscommon:16.3.91"/>
<androidPackage spec="com.mbridge.msdk.oversea:playercommon:16.3.91"/>
Expand All @@ -23,7 +16,11 @@
<androidPackage spec="com.mbridge.msdk.oversea:nativeex:16.3.91"/>
<androidPackage spec="com.mbridge.msdk.oversea:mbbanner:16.3.91"/>
<androidPackage spec="com.mbridge.msdk.oversea:mbbid:16.3.91"/>
</androidPackages>

<!-- Mintegral Android Repositories -->
<repositories>
<repository>https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea</repository>
</repositories>
<iosPods>
<!-- iOS Adapter -->
<iosPod name="ChartboostMediationAdapterMintegral" version="~> 4.7.3.0"/>
Expand Down
5 changes: 2 additions & 3 deletions ...ost.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/PangleDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-pangle:4.4.9.1.3+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.pangle.global:ads-sdk:4.9.1.3"/>

<!-- Pangle Android Repositories -->
<repositories>
<repository>https://artifact.bytedance.com/repository/pangle</repository>
</repositories>
</androidPackages>
<iosPods>
<!-- iOS Adapter -->
<iosPod name="ChartboostMediationAdapterPangle" version="~> 4.4.9.1.0"/>
Expand Down
5 changes: 2 additions & 3 deletions ...ost.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/TapjoyDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-tapjoy:4.12.11.1+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.tapjoy:tapjoy-android-sdk:12.11.1"/>

<!-- Tapjoy Android Repositories -->
<repositories>
<repository>https://sdk.tapjoy.com/</repository>
</repositories>
</androidPackages>
<iosPods>
<!-- iOS Adapter -->
<iosPod name="ChartboostMediationAdapterTapjoy" version="~> 4.13.0.0"/>
Expand Down
3 changes: 1 addition & 2 deletions ...t.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/UnityAdsDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-unity-ads:4.4.6.1+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.unity3d.ads:unity-ads:4.6.1"/>

<androidPackage spec="androidx.core:core:1.2.0"/>
</androidPackages>
<iosPods>
Expand Down
3 changes: 1 addition & 2 deletions ...ost.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/VungleDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-vungle:4.6.12.1+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.vungle:publisher-sdk-android:6.12.1"/>

<androidPackage spec="androidx.core:core:1.2.0"/>
</androidPackages>
<iosPods>
Expand Down
5 changes: 2 additions & 3 deletions ...oost.mediation.demo/Assets/com.chartboost.mediation/Editor/Adapters/YahooDependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
<!-- Android Adapter -->
<androidPackage spec="com.chartboost:chartboost-mediation-adapter-yahoo:4.1.4.0+@aar"/>

<!-- Partner Android SDK-->
<!-- Partner Android SDK Dependencies-->
<androidPackage spec="com.yahoo.mobile.ads:android-yahoo-mobile-sdk:1.4.0"/>

<!-- Yahoo Android Repositories -->
<repositories>
<repository>https://artifactory.yahooinc.com/artifactory/maven/</repository>
</repositories>
</androidPackages>
<iosPods>
<!-- iOS Adapter -->
<iosPod name="ChartboostMediationAdapterYahoo" version="~> 4.1.4.0"/>
Expand Down
9 changes: 7 additions & 2 deletions com.chartboost.mediation.demo/Assets/com.chartboost.mediation/Editor/selections.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
},
{
"id": "inmobi",
"android": "10.1.3",
"android": "10.5.4",
"ios": "10.5.0"
},
{
"id": "ironsource",
"android": "7.3.0.0",
"ios": "7.2.7.0"
"ios": "7.3.0.0"
},
{
"id": "meta",
Expand Down Expand Up @@ -80,6 +80,11 @@
"id": "yahoo",
"android": "1.4.0",
"ios": "1.4.0"
},
{
"id": "hyprmx",
"android": "6.0.3",
"ios": "6.0.0"
}
]
}
4 changes: 1 addition & 3 deletions com.chartboost.mediation/Editor/Adapters/AdapterDataSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ static AdapterDataSource()
/// <summary>
/// Endpoint where Adapter Data is stored.
/// </summary>
private const string Endpoint = "https://chartboost.s3.amazonaws.com/chartboost-mediation/mediation-integration/partners.json";

private const string Endpoint = "https://chartboost.s3.amazonaws.com/chartboost-mediation/mediation-integration/v2/partners.json";

private static readonly bool InitialCache;

Expand Down Expand Up @@ -75,7 +74,6 @@ private static Task<AdapterData> FetchCacheAndLoad()

if (newVersion <= oldVersion)
return Task.FromResult(cacheAdapterConfig);

Constants.PathToAdaptersCachedJson.FileCreate(newAdapters);
return Task.FromResult(newAdapterConfig);
}
Expand Down
4 changes: 2 additions & 2 deletions com.chartboost.mediation/Editor/Adapters/AdaptersWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ private static void CheckMediationVersion(VisualElement root)

var version = new Version(MediationSelection);
var packageVersion = new Version(ChartboostMediationPackage.version);
if (version != packageVersion)

if (version.Minor != packageVersion.Minor)
{
_warningButton.tooltip = $"Your selected dependencies for Chartboost Mediation {version} do not match your current package version {packageVersion}. Press to fix.";
root.Add(_warningButton);
Expand Down
Loading