Skip to content

Commit

Permalink
Merge pull request #217 from ChartBoost/release/Mediation/4.9.0
Browse files Browse the repository at this point in the history
Chartboost Mediation Unity SDK 4.9.0 into Main
  • Loading branch information
SCastanedaMunoz authored Mar 21, 2024
2 parents bd25063 + 03aac47 commit fe67df4
Show file tree
Hide file tree
Showing 94 changed files with 2,537 additions and 861 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Chartboost.CSharp.Mediation.Unity" version="4.8.0" manuallyInstalled="true" />
<package id="Chartboost.CSharp.Mediation.Unity" version="4.9.0" manuallyInstalled="true" />
<package id="Chartboost.CSharp.Threading.Unity" version="1.0.0" manuallyInstalled="true"/>
<package id="Chartboost.CSharp.Utilities.Unity" version="1.0.0" manuallyInstalled="true"/>
</packages>

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

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN

// Android Resolver Repos Start
([rootProject] + (rootProject.subprojects as List)).each { project ->
project.repositories {
Expand Down Expand Up @@ -28,7 +26,7 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' // Assets/com.chartboost.mediation/Editor/ChartboostMediationDependencies.xml:20
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' // Assets/com.chartboost.mediation/Editor/ChartboostMediationDependencies.xml:11
implementation 'com.chartboost:chartboost-mediation-adapter-chartboost:4.9.6.1+@aar' // Assets/com.chartboost.mediation/Editor/Adapters/ChartboostDependencies.xml:5
implementation 'com.chartboost:chartboost-mediation-sdk:4.8+' // Assets/com.chartboost.mediation/Editor/ChartboostMediationDependencies.xml:10
implementation 'com.chartboost:chartboost-mediation-sdk:4.9+' // Assets/com.chartboost.mediation/Editor/ChartboostMediationDependencies.xml:10
implementation 'com.chartboost:chartboost-sdk:9.6.1' // Assets/com.chartboost.mediation/Editor/Adapters/ChartboostDependencies.xml:8
implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' // Assets/com.chartboost.mediation/Editor/ChartboostMediationDependencies.xml:24
implementation 'com.google.android.gms:play-services-appset:16.0.2' // Assets/com.chartboost.mediation/Editor/ChartboostMediationDependencies.xml:25
Expand Down Expand Up @@ -74,13 +72,13 @@ android {
versionName '**VERSIONNAME**'
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
}

lintOptions {
abortOnError false
}

aaptOptions {
noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ')
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
}**PACKAGING_OPTIONS**
}**REPOSITORIES**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</repositories>

<!-- Chartboost Mediation Android SDK -->
<androidPackage spec="com.chartboost:chartboost-mediation-sdk:4.8+" />
<androidPackage spec="com.chartboost:chartboost-mediation-sdk:4.9+" />
<androidPackage spec="androidx.localbroadcastmanager:localbroadcastmanager:1.1.0" />
<androidPackage spec="com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0" />
<androidPackage spec="org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1" />
Expand All @@ -27,7 +27,7 @@
</androidPackages>
<iosPods>
<!-- Chartboost Mediation iOS SDK -->
<iosPod name="ChartboostMediationSDK" version="~> 4.8.0">
<iosPod name="ChartboostMediationSDK" version="~> 4.9.0">
<sources>
<source>https://github.com/CocoaPods/Specs</source>
</sources>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"mediationVersion": "4.8.0",
"mediationVersion": "4.9.0",
"adapterSelections": [
{
"id": "chartboost",
Expand Down
4 changes: 2 additions & 2 deletions com.chartboost.mediation.demo.nuget/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"com.chartboost.mediation.demo": "file:../../com.chartboost.mediation.demo",
"com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity",
"com.google.external-dependency-manager": "file:../../GooglePackages/com.google.external-dependency-manager-1.2.177.tgz",
"com.unity.ide.rider": "3.0.21",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.ide.rider": "3.0.27",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.ide.vscode": "1.2.5",
"com.unity.nuget.newtonsoft-json": "3.2.1",
"com.unity.test-framework": "1.1.33",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.21",
"version": "3.0.27",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -36,7 +36,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.18",
"version": "2.0.22",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package>androidx.lifecycle:lifecycle-extensions:2.2.0</package>
<package>androidx.localbroadcastmanager:localbroadcastmanager:1.1.0</package>
<package>com.chartboost:chartboost-mediation-adapter-chartboost:4.9.6.1+@aar</package>
<package>com.chartboost:chartboost-mediation-sdk:4.8+</package>
<package>com.chartboost:chartboost-mediation-sdk:4.9+</package>
<package>com.chartboost:chartboost-sdk:9.6.1</package>
<package>com.google.android.gms:play-services-ads-identifier:18.0.1</package>
<package>com.google.android.gms:play-services-appset:16.0.2</package>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!387306366 &1
MemorySettings:
m_ObjectHideFlags: 0
m_EditorMemorySettings:
m_MainAllocatorBlockSize: -1
m_ThreadAllocatorBlockSize: -1
m_MainGfxBlockSize: -1
m_ThreadGfxBlockSize: -1
m_CacheBlockSize: -1
m_TypetreeBlockSize: -1
m_ProfilerBlockSize: -1
m_ProfilerEditorBlockSize: -1
m_BucketAllocatorGranularity: -1
m_BucketAllocatorBucketsCount: -1
m_BucketAllocatorBlockSize: -1
m_BucketAllocatorBlockCount: -1
m_ProfilerBucketAllocatorGranularity: -1
m_ProfilerBucketAllocatorBucketsCount: -1
m_ProfilerBucketAllocatorBlockSize: -1
m_ProfilerBucketAllocatorBlockCount: -1
m_TempAllocatorSizeMain: -1
m_JobTempAllocatorBlockSize: -1
m_BackgroundJobTempAllocatorBlockSize: -1
m_JobTempAllocatorReducedBlockSize: -1
m_TempAllocatorSizeGIBakingWorker: -1
m_TempAllocatorSizeNavMeshWorker: -1
m_TempAllocatorSizeAudioWorker: -1
m_TempAllocatorSizeCloudWorker: -1
m_TempAllocatorSizeGfx: -1
m_TempAllocatorSizeJobWorker: -1
m_TempAllocatorSizeBackgroundWorker: -1
m_TempAllocatorSizePreloadManager: -1
m_PlatformMemorySettings: {}
Loading

0 comments on commit fe67df4

Please sign in to comment.