[HB-8748] Fix Unity Mediation Demo App (#222)

SCastanedaMunoz · helium-service · web-flow · commit 5e3e0ab27292 · 2024-10-07T20:38:16.000-05:00
Co-authored-by: helium-service &lt;helium-service@chartboost.com&gt;
diff --git a/NuGet/Chartboost.CSharp.Core.Unity.1.0.2.nupkg b/NuGet/Chartboost.CSharp.Core.Unity.1.0.2.nupkg
diff --git a/NuGet/Chartboost.CSharp.Core.Unity.Consent.GoogleUserMessagingPlatform.1.0.2.nupkg b/NuGet/Chartboost.CSharp.Core.Unity.Consent.GoogleUserMessagingPlatform.1.0.2.nupkg
diff --git a/NuGet/Chartboost.CSharp.Core.Unity.Consent.Unmanaged.1.0.0.nupkg b/NuGet/Chartboost.CSharp.Core.Unity.Consent.Unmanaged.1.0.0.nupkg
diff --git a/NuGet/Chartboost.CSharp.Logging.Unity.1.1.0.nupkg b/NuGet/Chartboost.CSharp.Logging.Unity.1.1.0.nupkg
diff --git a/com.chartboost.mediation.demo.nuget/Assets/Plugins/Android/mainTemplate.gradle b/com.chartboost.mediation.demo.nuget/Assets/Plugins/Android/mainTemplate.gradle
@@ -4,10 +4,10 @@ apply plugin: 'com.android.library'
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 // Android Resolver Dependencies Start
-    implementation 'com.chartboost:chartboost-core-sdk:1.0.+' // Assets/Packages/Chartboost.CSharp.Core.Unity.1.0.0/Editor/ChartboostCoreDependencies.xml:5
+    implementation 'com.chartboost:chartboost-core-sdk:1.0.+' // Assets/Packages/Chartboost.CSharp.Core.Unity.1.0.2/Editor/ChartboostCoreDependencies.xml:5
     implementation 'com.chartboost:chartboost-mediation-adapter-chartboost:5.9.7.+' // Assets/Packages/Chartboost.CSharp.Mediation.Unity.Adapter.Chartboost.5.0.0/Editor/ChartboostAdapterDependencies.xml:5
-    implementation 'com.chartboost:chartboost-mediation-sdk:5.0+' // Assets/Packages/Chartboost.CSharp.Mediation.Unity.5.0.0/Editor/ChartboostMediationDependencies.xml:10
-    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.10' // Assets/Packages/Chartboost.CSharp.Core.Unity.1.0.0/Editor/ChartboostCoreDependencies.xml:6
+    implementation 'com.chartboost:chartboost-mediation-sdk:5.1+' // Assets/Packages/Chartboost.CSharp.Mediation.Unity.5.1.0/Editor/ChartboostMediationDependencies.xml:10
+    implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.10' // Assets/Packages/Chartboost.CSharp.Core.Unity.1.0.2/Editor/ChartboostCoreDependencies.xml:6
 // Android Resolver Dependencies End
 **DEPS**}
 
diff --git a/com.chartboost.mediation.demo.nuget/Assets/Plugins/Android/settingsTemplate.gradle b/com.chartboost.mediation.demo.nuget/Assets/Plugins/Android/settingsTemplate.gradle
@@ -19,10 +19,10 @@ dependencyResolutionManagement {
 // Android Resolver Repos Start
         def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")
         maven {
-            url "https://cboost.jfrog.io/artifactory/chartboost-core/" // Assets/Packages/Chartboost.CSharp.Core.Unity.1.0.0/Editor/ChartboostCoreDependencies.xml:9
+            url "https://cboost.jfrog.io/artifactory/chartboost-core/" // Assets/Packages/Chartboost.CSharp.Core.Unity.1.0.2/Editor/ChartboostCoreDependencies.xml:9
         }
         maven {
-            url "https://cboost.jfrog.io/artifactory/chartboost-mediation/" // Assets/Packages/Chartboost.CSharp.Mediation.Unity.5.0.0/Editor/ChartboostMediationDependencies.xml:7
+            url "https://cboost.jfrog.io/artifactory/chartboost-mediation/" // Assets/Packages/Chartboost.CSharp.Mediation.Unity.5.1.0/Editor/ChartboostMediationDependencies.xml:7
         }
         maven {
             url "https://cboost.jfrog.io/artifactory/chartboost-ads/" // Assets/Packages/Chartboost.CSharp.Mediation.Unity.Adapter.Chartboost.5.0.0/Editor/ChartboostAdapterDependencies.xml:9
diff --git a/com.chartboost.mediation.demo.nuget/ProjectSettings/AndroidResolverDependencies.xml b/com.chartboost.mediation.demo.nuget/ProjectSettings/AndroidResolverDependencies.xml
@@ -2,7 +2,7 @@
   <packages>
     <package>com.chartboost:chartboost-core-sdk:1.0.+</package>
     <package>com.chartboost:chartboost-mediation-adapter-chartboost:5.9.7.+</package>
-    <package>com.chartboost:chartboost-mediation-sdk:5.0+</package>
+    <package>com.chartboost:chartboost-mediation-sdk:5.1+</package>
     <package>org.jetbrains.kotlin:kotlin-reflect:1.8.10</package>
   </packages>
   <files />
diff --git a/com.chartboost.mediation.demo.nuget/ProjectSettings/ProjectSettings.asset b/com.chartboost.mediation.demo.nuget/ProjectSettings/ProjectSettings.asset
@@ -139,7 +139,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 5.0.0
+  bundleVersion: 5.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -172,7 +172,7 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 22
+  AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 34
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -390,32 +390,6 @@ PlayerSettings:
       m_SubKind: 
   - m_BuildTarget: iPhone
     m_Icons:
-    - m_Textures:
-      - {fileID: 2800000, guid: 5fe9f4c774e3e45f3856188902537b58, type: 3}
-      m_Width: 180
-      m_Height: 180
-      m_Kind: 0
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 120
-      m_Height: 120
-      m_Kind: 0
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 167
-      m_Height: 167
-      m_Kind: 0
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 152
-      m_Height: 152
-      m_Kind: 0
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 76
-      m_Height: 76
-      m_Kind: 0
-      m_SubKind: iPad
     - m_Textures: []
       m_Width: 120
       m_Height: 120
@@ -486,6 +460,32 @@ PlayerSettings:
       m_Height: 1024
       m_Kind: 4
       m_SubKind: App Store
+    - m_Textures:
+      - {fileID: 2800000, guid: 5fe9f4c774e3e45f3856188902537b58, type: 3}
+      m_Width: 180
+      m_Height: 180
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 120
+      m_Height: 120
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 167
+      m_Height: 167
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 152
+      m_Height: 152
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 76
+      m_Height: 76
+      m_Kind: 0
+      m_SubKind: iPad
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1
diff --git a/com.chartboost.mediation.demo.upm/Assets/Plugins/Android/mainTemplate.gradle b/com.chartboost.mediation.demo.upm/Assets/Plugins/Android/mainTemplate.gradle
@@ -6,7 +6,7 @@ dependencies {
 // Android Resolver Dependencies Start
     implementation 'com.chartboost:chartboost-core-sdk:1.0.+' // Packages/com.chartboost.core/Editor/ChartboostCoreDependencies.xml:5
     implementation 'com.chartboost:chartboost-mediation-adapter-chartboost:5.9.7.+' // Packages/com.chartboost.mediation.unity.adapter.chartboost/Editor/ChartboostAdapterDependencies.xml:5
-    implementation 'com.chartboost:chartboost-mediation-sdk:5.0+' // Packages/com.chartboost.mediation/Editor/ChartboostMediationDependencies.xml:10
+    implementation 'com.chartboost:chartboost-mediation-sdk:5.1+' // Packages/com.chartboost.mediation/Editor/ChartboostMediationDependencies.xml:10
     implementation 'org.jetbrains.kotlin:kotlin-reflect:1.8.10' // Packages/com.chartboost.core/Editor/ChartboostCoreDependencies.xml:6
 // Android Resolver Dependencies End
 **DEPS**}
diff --git a/com.chartboost.mediation.demo.upm/ProjectSettings/AndroidResolverDependencies.xml b/com.chartboost.mediation.demo.upm/ProjectSettings/AndroidResolverDependencies.xml
@@ -2,7 +2,7 @@
   <packages>
     <package>com.chartboost:chartboost-core-sdk:1.0.+</package>
     <package>com.chartboost:chartboost-mediation-adapter-chartboost:5.9.7.+</package>
-    <package>com.chartboost:chartboost-mediation-sdk:5.0+</package>
+    <package>com.chartboost:chartboost-mediation-sdk:5.1+</package>
     <package>org.jetbrains.kotlin:kotlin-reflect:1.8.10</package>
   </packages>
   <files />
diff --git a/com.chartboost.mediation.demo.upm/ProjectSettings/ProjectSettings.asset b/com.chartboost.mediation.demo.upm/ProjectSettings/ProjectSettings.asset
@@ -139,7 +139,7 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 5.0.0
+  bundleVersion: 5.1.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -172,7 +172,7 @@ PlayerSettings:
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 22
+  AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 34
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -392,32 +392,6 @@ PlayerSettings:
       m_SubKind: 
   - m_BuildTarget: iPhone
     m_Icons:
-    - m_Textures:
-      - {fileID: 2800000, guid: 5fe9f4c774e3e45f3856188902537b58, type: 3}
-      m_Width: 180
-      m_Height: 180
-      m_Kind: 0
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 120
-      m_Height: 120
-      m_Kind: 0
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 167
-      m_Height: 167
-      m_Kind: 0
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 152
-      m_Height: 152
-      m_Kind: 0
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 76
-      m_Height: 76
-      m_Kind: 0
-      m_SubKind: iPad
     - m_Textures: []
       m_Width: 120
       m_Height: 120
@@ -488,6 +462,32 @@ PlayerSettings:
       m_Height: 1024
       m_Kind: 4
       m_SubKind: App Store
+    - m_Textures:
+      - {fileID: 2800000, guid: 5fe9f4c774e3e45f3856188902537b58, type: 3}
+      m_Width: 180
+      m_Height: 180
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 120
+      m_Height: 120
+      m_Kind: 0
+      m_SubKind: iPhone
+    - m_Textures: []
+      m_Width: 167
+      m_Height: 167
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 152
+      m_Height: 152
+      m_Kind: 0
+      m_SubKind: iPad
+    - m_Textures: []
+      m_Width: 76
+      m_Height: 76
+      m_Kind: 0
+      m_SubKind: iPad
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1
diff --git a/com.chartboost.mediation.demo/Editor/DemoSetupOnEditorLaunch.cs b/com.chartboost.mediation.demo/Editor/DemoSetupOnEditorLaunch.cs
@@ -1,5 +1,6 @@
 using Chartboost.Mediation;
 using UnityEditor;
+using UnityEditor.Build;
 using UnityEngine;
 using UnityEngine.Rendering;
 
@@ -32,21 +33,21 @@ private static void SetupDemoApp() {
                 mediationIcon
             };
 
-            PlayerSettings.Android.minSdkVersion = AndroidSdkVersions.AndroidApiLevel22;
+            PlayerSettings.Android.minSdkVersion = AndroidSdkVersions.AndroidApiLevel23;
             PlayerSettings.Android.targetSdkVersion = (AndroidSdkVersions)34;
             PlayerSettings.iOS.targetOSVersionString = "11.0";
-
-            PlayerSettings.SetIconsForTargetGroup(BuildTargetGroup.Android, icons);
-            PlayerSettings.SetIconsForTargetGroup(BuildTargetGroup.iOS, icons);
-            PlayerSettings.SetIconsForTargetGroup(BuildTargetGroup.Unknown, icons);
-
-            PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Android, ApplicationBundleIdentifier);
-            PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.iOS, ApplicationBundleIdentifier);
-            PlayerSettings.SetApplicationIdentifier(BuildTargetGroup.Standalone, ApplicationBundleIdentifier);
-
-            PlayerSettings.SetAdditionalCompilerArgumentsForGroup(BuildTargetGroup.Android, CompilerFlags);
-            PlayerSettings.SetAdditionalCompilerArgumentsForGroup(BuildTargetGroup.iOS, CompilerFlags);
-            PlayerSettings.SetAdditionalCompilerArgumentsForGroup(BuildTargetGroup.Standalone, CompilerFlags);
+            
+            PlayerSettings.SetIcons(NamedBuildTarget.Android, icons, IconKind.Application);
+            PlayerSettings.SetIcons(NamedBuildTarget.iOS, icons, IconKind.Application);
+            PlayerSettings.SetIcons(NamedBuildTarget.Unknown, icons, IconKind.Application);
+            
+            PlayerSettings.SetApplicationIdentifier(NamedBuildTarget.Android, ApplicationBundleIdentifier);
+            PlayerSettings.SetApplicationIdentifier(NamedBuildTarget.iOS, ApplicationBundleIdentifier);
+            PlayerSettings.SetApplicationIdentifier(NamedBuildTarget.Standalone, ApplicationBundleIdentifier);
+            
+            PlayerSettings.SetAdditionalCompilerArguments(NamedBuildTarget.Android, CompilerFlags);
+            PlayerSettings.SetAdditionalCompilerArguments(NamedBuildTarget.iOS, CompilerFlags);
+            PlayerSettings.SetAdditionalCompilerArguments(NamedBuildTarget.Standalone, CompilerFlags);
 
             // Addresses an issue with 2022 LTS where development builds using Vulkan API will crash.
             PlayerSettings.SetUseDefaultGraphicsAPIs(BuildTarget.Android, false);
diff --git a/com.chartboost.mediation.demo/Runtime/AdControllers/BannerAdController.cs b/com.chartboost.mediation.demo/Runtime/AdControllers/BannerAdController.cs
@@ -1,6 +1,7 @@
 using Chartboost.Mediation.Ad.Banner;
 using Chartboost.Mediation.Demo.Loading;
 using Chartboost.Mediation.Requests;
+using Chartboost.Mediation.Utilities;
 using UnityEngine;
 
 namespace Chartboost.Mediation.Demo.AdControllers
@@ -33,8 +34,8 @@ public override async void Load()
             _banner.Keywords = DefaultKeywords;
 
             // Bottom-center
-            _banner.Position = new Vector2(Screen.width / 2f, 0);
-            _banner.Pivot = new Vector2(0.5f, 0);
+            _banner.Position = new Vector2( DensityConverters.PixelsToNative(Screen.width / 2f), DensityConverters.PixelsToNative(Screen.height));
+            _banner.Pivot = new Vector2(0.5f, 1);
 
             var adLoadRequest = new BannerAdLoadRequest(PlacementIdentifier, BannerSize.Standard);
             
diff --git a/com.chartboost.mediation.demo/Runtime/AdControllers/UnityBannerAdController.cs b/com.chartboost.mediation.demo/Runtime/AdControllers/UnityBannerAdController.cs
@@ -2,6 +2,8 @@
 using Chartboost.Mediation.Ad.Banner.Unity;
 using Chartboost.Mediation.Demo.Loading;
 using Chartboost.Mediation.Demo.Pages;
+using Chartboost.Mediation.Requests;
+using Chartboost.Mediation.Utilities;
 using UnityEngine;
 
 namespace Chartboost.Mediation.Demo.AdControllers
@@ -26,8 +28,14 @@ public override async void Load()
             _unityBanner.DidEndDrag += OnDidEndDragBanner;
             _unityBanner.Keywords = DefaultKeywords;
 
+            // Bottom-center
+            _unityBanner.transform.position = new Vector3(Screen.width / 2f, 0, 0);
+            _unityBanner.GetComponent<RectTransform>().pivot = new Vector2(0.5f, 0);
+
+            var adLoadRequest = new BannerAdLoadRequest(PlacementIdentifier, BannerSize.Standard);
+
             LoadingOverlay.Instance.ToggleLoadingOverlay(true);
-            var adLoadResult = await _unityBanner.Load();
+            var adLoadResult = await _unityBanner.Load(adLoadRequest);
             LoadingOverlay.Instance.ToggleLoadingOverlay(false);
             
             if (adLoadResult.Error.HasValue)
@@ -59,6 +67,14 @@ private void OnDidRecordImpressionBanner(UnityBannerAd unityBannerAd)
         private void OnWillAppearBanner(UnityBannerAd unityBannerAd)
         {
             Debug.Log("Unity Banner Loaded");
+            
+            // Update size
+            var canvasScale = _unityBanner.GetComponentInParent<Canvas>().transform.localScale.x;
+            var width = DensityConverters.NativeToPixels(_unityBanner.BannerSize?.Width ?? 0)/canvasScale;
+            var height = DensityConverters.NativeToPixels(_unityBanner.BannerSize?.Height ?? 0)/canvasScale;
+            var rectTransform = _unityBanner.GetComponent<RectTransform>();
+            rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, width);
+            rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, height);
         }
 
         private void OnDidClickBanner(UnityBannerAd unityBannerAd)

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ dependencyResolutionManagement {`
`19`	`19`	`// Android Resolver Repos Start`
`20`	`20`	`def unityProjectPath = $/file:///DIR_UNITYPROJECT/$.replace("\\", "/")`
`21`	`21`	`maven {`
`22`		`- url "https://cboost.jfrog.io/artifactory/chartboost-core/" // Assets/Packages/Chartboost.CSharp.Core.Unity.1.0.0/Editor/ChartboostCoreDependencies.xml:9`
	`22`	`+ url "https://cboost.jfrog.io/artifactory/chartboost-core/" // Assets/Packages/Chartboost.CSharp.Core.Unity.1.0.2/Editor/ChartboostCoreDependencies.xml:9`
`23`	`23`	`}`
`24`	`24`	`maven {`
`25`		`- url "https://cboost.jfrog.io/artifactory/chartboost-mediation/" // Assets/Packages/Chartboost.CSharp.Mediation.Unity.5.0.0/Editor/ChartboostMediationDependencies.xml:7`
	`25`	`+ url "https://cboost.jfrog.io/artifactory/chartboost-mediation/" // Assets/Packages/Chartboost.CSharp.Mediation.Unity.5.1.0/Editor/ChartboostMediationDependencies.xml:7`
`26`	`26`	`}`
`27`	`27`	`maven {`
`28`	`28`	`url "https://cboost.jfrog.io/artifactory/chartboost-ads/" // Assets/Packages/Chartboost.CSharp.Mediation.Unity.Adapter.Chartboost.5.0.0/Editor/ChartboostAdapterDependencies.xml:9`