diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Android.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Android.dll
index 5e85c6d..8692740 100755
Binary files a/Assets/GoogleMobileAds/GoogleMobileAds.Android.dll and b/Assets/GoogleMobileAds/GoogleMobileAds.Android.dll differ
diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll
index 9f085a5..a5c4a7c 100755
Binary files a/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll and b/Assets/GoogleMobileAds/GoogleMobileAds.Common.dll differ
diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Core.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Core.dll
index acb38a4..21ab28d 100755
Binary files a/Assets/GoogleMobileAds/GoogleMobileAds.Core.dll and b/Assets/GoogleMobileAds/GoogleMobileAds.Core.dll differ
diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Ump.Android.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Ump.Android.dll
new file mode 100755
index 0000000..3783a7b
Binary files /dev/null and b/Assets/GoogleMobileAds/GoogleMobileAds.Ump.Android.dll differ
diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Ump.Unity.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Ump.Unity.dll
new file mode 100755
index 0000000..39564fa
Binary files /dev/null and b/Assets/GoogleMobileAds/GoogleMobileAds.Ump.Unity.dll differ
diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Ump.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Ump.dll
new file mode 100755
index 0000000..66315e6
Binary files /dev/null and b/Assets/GoogleMobileAds/GoogleMobileAds.Ump.dll differ
diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.Unity.dll b/Assets/GoogleMobileAds/GoogleMobileAds.Unity.dll
index 9063463..e331827 100755
Binary files a/Assets/GoogleMobileAds/GoogleMobileAds.Unity.dll and b/Assets/GoogleMobileAds/GoogleMobileAds.Unity.dll differ
diff --git a/Assets/GoogleMobileAds/GoogleMobileAds.dll b/Assets/GoogleMobileAds/GoogleMobileAds.dll
index c4161a2..9901664 100755
Binary files a/Assets/GoogleMobileAds/GoogleMobileAds.dll and b/Assets/GoogleMobileAds/GoogleMobileAds.dll differ
diff --git a/Assets/GoogleMobileAds/link.xml b/Assets/GoogleMobileAds/link.xml
index 5ff0143..7db049d 100755
--- a/Assets/GoogleMobileAds/link.xml
+++ b/Assets/GoogleMobileAds/link.xml
@@ -3,4 +3,8 @@
+
+
+
+
diff --git a/Assets/Plugins/Android/TapsellMediationAdmobAdapterPlugin/AndroidManifest.xml b/Assets/Plugins/Android/TapsellMediationAdmobAdapterPlugin/AndroidManifest.xml
new file mode 100644
index 0000000..6f0a631
--- /dev/null
+++ b/Assets/Plugins/Android/TapsellMediationAdmobAdapterPlugin/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Plugins/Android/TapsellMediationApplovinAdapterPlugin/AndroidManifest.xml b/Assets/Plugins/Android/TapsellMediationApplovinAdapterPlugin/AndroidManifest.xml
new file mode 100644
index 0000000..323ba7e
--- /dev/null
+++ b/Assets/Plugins/Android/TapsellMediationApplovinAdapterPlugin/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Plugins/Android/TapsellMediationPlugin/AndroidManifest.xml b/Assets/Plugins/Android/TapsellMediationPlugin/AndroidManifest.xml
new file mode 100644
index 0000000..dc0bb13
--- /dev/null
+++ b/Assets/Plugins/Android/TapsellMediationPlugin/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Plugins/Android/googlemobileads-unity.aar b/Assets/Plugins/Android/googlemobileads-unity.aar
index da8f199..e2005d8 100755
Binary files a/Assets/Plugins/Android/googlemobileads-unity.aar and b/Assets/Plugins/Android/googlemobileads-unity.aar differ
diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle
index c5d5ce5..1180ed4 100755
--- a/Assets/Plugins/Android/mainTemplate.gradle
+++ b/Assets/Plugins/Android/mainTemplate.gradle
@@ -5,12 +5,13 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
// Android Resolver Dependencies Start
implementation 'com.google.code.gson:gson:2.8.5' // Assets/GoogleMobileAdsNative/Editor/GoogleMobileAdsNativeDependencies.xml:3
- implementation 'ir.tapsell.mediation.adapter:admob-unity:1.0.1-beta04' // Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobAdapterDependencies.xml:7
- implementation 'ir.tapsell.mediation.adapter:applovin-unity:1.0.1-beta04' // Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinAdapterDependencies.xml:7
- implementation 'ir.tapsell.mediation.adapter:ironsource-unity:1.0.1-beta04' // Assets/Tapsell/Mediation/Adapter/IronSource/Editor/IronSourceAdapterDependencies.xml:3
- implementation 'ir.tapsell.mediation.adapter:legacy-unity:1.0.1-beta04' // Assets/Tapsell/Mediation/Adapter/Legacy/Editor/LegacyAdapterDependencies.xml:3
- implementation 'ir.tapsell.mediation.adapter:mintegral-unity:1.0.0-beta10' // Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml:8
- implementation 'ir.tapsell.mediation:tapsell-unity:1.0.1-beta04' // Assets/Tapsell/Mediation/Editor/MediationDependencies.xml:3
+ implementation 'ir.tapsell.mediation.adapter:admob-unity:1.0.1-beta07' // Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobAdapterDependencies.xml:7
+ implementation 'ir.tapsell.mediation.adapter:applovin-unity:1.0.1-beta07' // Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinAdapterDependencies.xml:7
+ implementation 'ir.tapsell.mediation.adapter:fyber-unity:1.0.1-beta07' // Assets/Tapsell/Mediation/Adapter/Fyber/Editor/FyberAdapterDependencies.xml:7
+ implementation 'ir.tapsell.mediation.adapter:ironsource-unity:1.0.1-beta07' // Assets/Tapsell/Mediation/Adapter/IronSource/Editor/IronSourceAdapterDependencies.xml:3
+ implementation 'ir.tapsell.mediation.adapter:legacy-unity:1.0.1-beta07' // Assets/Tapsell/Mediation/Adapter/Legacy/Editor/LegacyAdapterDependencies.xml:3
+ implementation 'ir.tapsell.mediation.adapter:mintegral-unity:1.0.1-beta07' // Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml:8
+ implementation 'ir.tapsell.mediation:tapsell-unity:1.0.1-beta07' // Assets/Tapsell/Mediation/Editor/MediationDependencies.xml:3
// Android Resolver Dependencies End
**DEPS**}
diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle
index bba761c..06e558f 100755
--- a/Assets/Plugins/Android/settingsTemplate.gradle
+++ b/Assets/Plugins/Android/settingsTemplate.gradle
@@ -19,7 +19,7 @@ dependencyResolutionManagement {
// Android Resolver Repos Start
def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")
maven {
- url "https://android-sdk.is.com" // Assets/Tapsell/Mediation/Adapter/IronSource/Editor/IronSourceAdapterDependencies.xml:6, Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobAdapterDependencies.xml:7, Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinAdapterDependencies.xml:7, Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml:8
+ url "https://android-sdk.is.com" // Assets/Tapsell/Mediation/Adapter/IronSource/Editor/IronSourceAdapterDependencies.xml:6, Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobAdapterDependencies.xml:7, Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinAdapterDependencies.xml:7, Assets/Tapsell/Mediation/Adapter/Fyber/Editor/FyberAdapterDependencies.xml:7, Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml:8
}
maven {
url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" // Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml:8
diff --git a/Assets/Tapsell/Mediation/Adapter/Admob/AdmobAndroidCaller.cs b/Assets/Tapsell/Mediation/Adapter/Admob/AdmobAndroidCaller.cs
index a947999..115007c 100644
--- a/Assets/Tapsell/Mediation/Adapter/Admob/AdmobAndroidCaller.cs
+++ b/Assets/Tapsell/Mediation/Adapter/Admob/AdmobAndroidCaller.cs
@@ -6,7 +6,7 @@ namespace Tapsell.Mediation.Adapter.Admob
{
internal static class AdmobAndroidCaller
{
- private static readonly AndroidJavaClass AndroidClass = new("ir.tapsell.mediation.adapter.admob.unity.Admob");
+ private static readonly AndroidJavaClass AndroidClass = new AndroidJavaClass("ir.tapsell.mediation.adapter.admob.unity.Admob");
internal static void Call(string methodName, params object[] args)
{
diff --git a/Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobAdapterDependencies.xml
index df411a9..3da0e0b 100644
--- a/Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobAdapterDependencies.xml
+++ b/Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobAdapterDependencies.xml
@@ -1,6 +1,6 @@
-
+
https://android-sdk.is.com
diff --git a/Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobManifestProcessor.cs b/Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobManifestProcessor.cs
index 674c2b8..73dd6b6 100755
--- a/Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobManifestProcessor.cs
+++ b/Assets/Tapsell/Mediation/Adapter/Admob/Editor/AdmobManifestProcessor.cs
@@ -14,7 +14,11 @@ private protected override string PluginName()
private protected override string ManifestRelativePath()
{
- return "Plugins/Android/TapsellMediationAdmobAdapterPlugin.androidlib/AndroidManifest.xml";
+#if UNITY_2021_2_OR_NEWER
+ return "Plugins/Android/TapsellMediationAdmobAdapterPlugin/AndroidManifest.xml";
+#else
+ return "Plugins/Android/AndroidManifest.xml";
+#endif
}
private protected override string MetadataApplicationKey()
diff --git a/Assets/Tapsell/Mediation/Adapter/Admob/NativeAdapter.cs b/Assets/Tapsell/Mediation/Adapter/Admob/NativeAdapter.cs
index 6b3d0e5..5f2c158 100644
--- a/Assets/Tapsell/Mediation/Adapter/Admob/NativeAdapter.cs
+++ b/Assets/Tapsell/Mediation/Adapter/Admob/NativeAdapter.cs
@@ -12,15 +12,15 @@ internal class NativeAdapter
{
private static NativeAdapter _instance;
- private readonly Dictionary _ads = new();
+ private readonly Dictionary _ads = new Dictionary();
// Since Admob impression callback is not always called, we call the listener in multiple triggers.
// This List is used to prevent multiple calls.
- private readonly List _impressionCalled = new();
+ private readonly List _impressionCalled = new List();
// Since Admob click callback is not always called, we call the listener in both open and click triggers.
// For each filled ad there can be only one click source activated.
- private readonly Dictionary _clickCallSources = new();
+ private readonly Dictionary _clickCallSources = new Dictionary();
private static class AndroidAPIs
{
@@ -51,9 +51,9 @@ internal void RequestNativeAd(NativeRequestInfo info)
adLoader.OnNativeAdLoaded += (_, args) => OnAdLoadSuccess(info.requestId, args.nativeAd);
adLoader.OnAdFailedToLoad += (_, args) => OnAdLoadFailure(info.requestId, args);
- adLoader.OnNativeAdClicked += (_, _) => OnAdClick(info.requestId);
- adLoader.OnNativeAdImpression += (_, _) => OnAdImpression(info.requestId);
- adLoader.OnNativeAdOpening += (_, _) => OnAdOpened(info.requestId);
+ adLoader.OnNativeAdClicked += (_, args) => OnAdClick(info.requestId);
+ adLoader.OnNativeAdImpression += (_, args) => OnAdImpression(info.requestId);
+ adLoader.OnNativeAdOpening += (_, args) => OnAdOpened(info.requestId);
adLoader.LoadAd(new AdRequest());
}
diff --git a/Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinAdapterDependencies.xml
index 3d756e2..449a2ea 100644
--- a/Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinAdapterDependencies.xml
+++ b/Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinAdapterDependencies.xml
@@ -1,6 +1,6 @@
-
+
https://android-sdk.is.com
diff --git a/Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinManifestProcessor.cs b/Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinManifestProcessor.cs
index 3309b7b..163551d 100755
--- a/Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinManifestProcessor.cs
+++ b/Assets/Tapsell/Mediation/Adapter/Applovin/Editor/ApplovinManifestProcessor.cs
@@ -14,7 +14,12 @@ private protected override string PluginName()
private protected override string ManifestRelativePath()
{
- return "Plugins/Android/TapsellMediationApplovinAdapterPlugin.androidlib/AndroidManifest.xml";
+#if UNITY_2021_2_OR_NEWER
+ return "Plugins/Android/TapsellMediationApplovinAdapterPlugin/AndroidManifest.xml";
+#else
+ return "Plugins/Android/AndroidManifest.xml";
+#endif
+
}
private protected override string MetadataApplicationKey()
diff --git a/Assets/Tapsell/Mediation/Adapter/Chartboost/Editor/ChartboostAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/Chartboost/Editor/ChartboostAdapterDependencies.xml
new file mode 100644
index 0000000..15aefce
--- /dev/null
+++ b/Assets/Tapsell/Mediation/Adapter/Chartboost/Editor/ChartboostAdapterDependencies.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Tapsell/Mediation/Adapter/Fyber/Editor/FyberAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/Fyber/Editor/FyberAdapterDependencies.xml
new file mode 100644
index 0000000..ccc6d6b
--- /dev/null
+++ b/Assets/Tapsell/Mediation/Adapter/Fyber/Editor/FyberAdapterDependencies.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ https://android-sdk.is.com
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Tapsell/Mediation/Adapter/IronSource/Editor/IronSourceAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/IronSource/Editor/IronSourceAdapterDependencies.xml
index da799ab..9452323 100644
--- a/Assets/Tapsell/Mediation/Adapter/IronSource/Editor/IronSourceAdapterDependencies.xml
+++ b/Assets/Tapsell/Mediation/Adapter/IronSource/Editor/IronSourceAdapterDependencies.xml
@@ -1,6 +1,6 @@
-
+
https://android-sdk.is.com
diff --git a/Assets/Tapsell/Mediation/Adapter/Legacy/Editor/LegacyAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/Legacy/Editor/LegacyAdapterDependencies.xml
index 813f6b7..48b2e5f 100644
--- a/Assets/Tapsell/Mediation/Adapter/Legacy/Editor/LegacyAdapterDependencies.xml
+++ b/Assets/Tapsell/Mediation/Adapter/Legacy/Editor/LegacyAdapterDependencies.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Assets/Tapsell/Mediation/Adapter/Legacy/LegacyAndroidCaller.cs b/Assets/Tapsell/Mediation/Adapter/Legacy/LegacyAndroidCaller.cs
index 79fe474..0af5225 100644
--- a/Assets/Tapsell/Mediation/Adapter/Legacy/LegacyAndroidCaller.cs
+++ b/Assets/Tapsell/Mediation/Adapter/Legacy/LegacyAndroidCaller.cs
@@ -6,7 +6,7 @@ namespace Tapsell.Mediation.Adapter.Legacy
{
internal static class LegacyAndroidCaller
{
- private static readonly AndroidJavaClass AndroidClass = new("ir.tapsell.mediation.adapter.legacy.unity.Legacy");
+ private static readonly AndroidJavaClass AndroidClass = new AndroidJavaClass("ir.tapsell.mediation.adapter.legacy.unity.Legacy");
internal static void Call(string methodName, params object[] args)
{
diff --git a/Assets/Tapsell/Mediation/Adapter/Liftoff/Editor/LiftoffAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/Liftoff/Editor/LiftoffAdapterDependencies.xml
new file mode 100644
index 0000000..5799a1e
--- /dev/null
+++ b/Assets/Tapsell/Mediation/Adapter/Liftoff/Editor/LiftoffAdapterDependencies.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml
index 5a88134..24e4b8f 100644
--- a/Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml
+++ b/Assets/Tapsell/Mediation/Adapter/Mintegral/Editor/MintegralAdapterDependencies.xml
@@ -1,6 +1,6 @@
-
+
https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea
https://android-sdk.is.com
diff --git a/Assets/Tapsell/Mediation/Adapter/UnityAds/Editor/UnityAdsAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/UnityAds/Editor/UnityAdsAdapterDependencies.xml
new file mode 100644
index 0000000..8a29c76
--- /dev/null
+++ b/Assets/Tapsell/Mediation/Adapter/UnityAds/Editor/UnityAdsAdapterDependencies.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Tapsell/Mediation/Adapter/Wortise/Editor/WortiseAdapterDependencies.xml b/Assets/Tapsell/Mediation/Adapter/Wortise/Editor/WortiseAdapterDependencies.xml
new file mode 100644
index 0000000..c6c56bc
--- /dev/null
+++ b/Assets/Tapsell/Mediation/Adapter/Wortise/Editor/WortiseAdapterDependencies.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/Tapsell/Mediation/Editor/GradleBuildPostProcessor.cs b/Assets/Tapsell/Mediation/Editor/GradleBuildPostProcessor.cs
index 04b1d08..1ddd4f9 100644
--- a/Assets/Tapsell/Mediation/Editor/GradleBuildPostProcessor.cs
+++ b/Assets/Tapsell/Mediation/Editor/GradleBuildPostProcessor.cs
@@ -44,7 +44,7 @@ private static string AddPackageIfNotPresent(string currentValue, string newPack
var trimmedValue = currentValue.Trim();
if (trimmedValue.Length == 0) return newPackage;
- if (trimmedValue.Split(",").Any(package => package.Trim().Equals(newPackage)))
+ if (trimmedValue.Split(',').Any(package => package.Trim().Equals(newPackage)))
{
return currentValue;
}
diff --git a/Assets/Tapsell/Mediation/Editor/MediationDependencies.xml b/Assets/Tapsell/Mediation/Editor/MediationDependencies.xml
index 7c2916a..c41b221 100644
--- a/Assets/Tapsell/Mediation/Editor/MediationDependencies.xml
+++ b/Assets/Tapsell/Mediation/Editor/MediationDependencies.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/Assets/Tapsell/Mediation/Editor/MediationManifestProcessor.cs b/Assets/Tapsell/Mediation/Editor/MediationManifestProcessor.cs
index c2665cf..01cfbac 100755
--- a/Assets/Tapsell/Mediation/Editor/MediationManifestProcessor.cs
+++ b/Assets/Tapsell/Mediation/Editor/MediationManifestProcessor.cs
@@ -13,7 +13,11 @@ private protected override string PluginName()
private protected override string ManifestRelativePath()
{
- return "Plugins/Android/TapsellMediationPlugin.androidlib/AndroidManifest.xml";
+#if UNITY_2021_2_OR_NEWER
+ return "Plugins/Android/TapsellMediationPlugin/AndroidManifest.xml";
+#else
+ return "Plugins/Android/AndroidManifest.xml";
+#endif
}
private protected override string MetadataApplicationKey()
diff --git a/Assets/Tapsell/Mediation/Editor/Utils/PropertiesHelper.cs b/Assets/Tapsell/Mediation/Editor/Utils/PropertiesHelper.cs
index 7356bdc..4a4914a 100644
--- a/Assets/Tapsell/Mediation/Editor/Utils/PropertiesHelper.cs
+++ b/Assets/Tapsell/Mediation/Editor/Utils/PropertiesHelper.cs
@@ -3,7 +3,6 @@
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
-using UnityEngine;
namespace Tapsell.Mediation.Editor.Utils
{
@@ -99,11 +98,9 @@ public static IDictionary Load(TextReader reader)
public static void Write(IDictionary properties, TextWriter writer)
{
- foreach(var (key, value) in properties)
+ foreach(KeyValuePair pair in properties)
{
- // print the key and value
- // Debug.LogError("key: " + key + ", value: " + value);
- writer.Write(key + "=" + value + "\n");
+ writer.Write(pair.Key + "=" + pair.Value + "\n");
}
}
@@ -198,7 +195,18 @@ private static string RemoveLeadingWhiteSpaces(string str)
private static string RemoveLastChar(string str)
{
+#if UNITY_2021_2_OR_NEWER
return str[..^1];
+#else
+ if (str.Length > 0)
+ {
+ return str.Substring(0, str.Length - 1);
+ }
+ else
+ {
+ return str;
+ }
+#endif
}
private static KeyValuePair? ParseLine(string line)
@@ -409,12 +417,12 @@ private static string ExtractValue(string line, int index)
private static bool IsWhiteSpace(char c)
{
- return c is ' ' or '\t' or '\f';
+ return c == ' ' || c == '\t' || c == '\f';
}
private static bool IsSeparator(char c)
{
- return c is '=' or ':';
+ return c == '=' || c == ':';
}
///
@@ -428,19 +436,19 @@ private static bool IsSeparator(char c)
private static int? HexToInt(char c)
{
// 0-9
- if (c is >= '0' and <= '9')
+ if (c >= '0' && c <= '9')
{
return c - '0';
}
// A-F
- if (c is >= 'A' and <= 'F')
+ if (c >= 'A' && c <= 'F')
{
return c - 'A' + 10;
}
// a-f
- if (c is >= 'a' and <= 'f')
+ if (c >= 'a' && c <= 'f')
{
return c - 'a' + 10;
}
diff --git a/Assets/Tapsell/Mediation/MediatorAndroidCaller.cs b/Assets/Tapsell/Mediation/MediatorAndroidCaller.cs
index 2bfe066..b2c6f27 100644
--- a/Assets/Tapsell/Mediation/MediatorAndroidCaller.cs
+++ b/Assets/Tapsell/Mediation/MediatorAndroidCaller.cs
@@ -6,7 +6,7 @@ namespace Tapsell.Mediation
{
internal static class MediatorAndroidCaller
{
- private static readonly AndroidJavaClass AndroidClass = new("ir.tapsell.mediation.Tapsell");
+ private static readonly AndroidJavaClass AndroidClass = new AndroidJavaClass("ir.tapsell.mediation.Tapsell");
internal static void Call(string methodName, params object[] args)
{
diff --git a/Assets/Tapsell/Mediation/Request/BannerSize.cs b/Assets/Tapsell/Mediation/Request/BannerSize.cs
index cda032a..1900410 100644
--- a/Assets/Tapsell/Mediation/Request/BannerSize.cs
+++ b/Assets/Tapsell/Mediation/Request/BannerSize.cs
@@ -1,12 +1,14 @@
namespace Tapsell.Mediation.Request
{
public enum BannerSize {
+ Banner30050,
Banner32050,
Banner320100,
Banner250250,
Banner300250,
Banner46860,
Banner72890,
- Banner160600
+ Banner160600,
+ BannerAdaptive
}
}
\ No newline at end of file
diff --git a/Assets/Tapsell/Mediation/Request/RequestCourier.cs b/Assets/Tapsell/Mediation/Request/RequestCourier.cs
index db1e520..f9c4787 100644
--- a/Assets/Tapsell/Mediation/Request/RequestCourier.cs
+++ b/Assets/Tapsell/Mediation/Request/RequestCourier.cs
@@ -6,7 +6,7 @@ namespace Tapsell.Mediation.Request
internal class RequestCourier
{
private static RequestCourier _instance;
- private readonly Dictionary _listeners = new();
+ private readonly Dictionary _listeners = new Dictionary();
private static class NativeRequestAPIs
{
diff --git a/Assets/Tapsell/Mediation/Resources/TapsellMediationSettings.asset b/Assets/Tapsell/Mediation/Resources/TapsellMediationSettings.asset
index 16b90ce..704ddda 100644
--- a/Assets/Tapsell/Mediation/Resources/TapsellMediationSettings.asset
+++ b/Assets/Tapsell/Mediation/Resources/TapsellMediationSettings.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 64f00de1f65c4718951b5554fd4bfa1e, type: 3}
m_Name: TapsellMediationSettings
m_EditorClassIdentifier:
- tapsellAndroidAppKey: 76798342-99a7-4a5f-bf5a-60a088d5dcfb
+ tapsellAndroidAppKey: a12e38ed-f1fc-4c76-b638-55f06c103066
tapsellAndroidAppMarketKey:
admobAdapterSignature: ca-app-pub-6201798499291567~9611758993
applovinAdapterSignature: 5WfZLCGTQmDr6Mf7BBEf5blVwrf8VBMJSmwUSq9-1q5bPpCH_OGAWEP2z2lRkmonLgPzG6gbL4DlvUF9frFmt6
diff --git a/Assets/Tapsell/Mediation/Show/Native/NativeAdViewHolder.cs b/Assets/Tapsell/Mediation/Show/Native/NativeAdViewHolder.cs
index e98d7de..769e562 100644
--- a/Assets/Tapsell/Mediation/Show/Native/NativeAdViewHolder.cs
+++ b/Assets/Tapsell/Mediation/Show/Native/NativeAdViewHolder.cs
@@ -9,7 +9,7 @@ internal class NativeAdViewHolder
{
private static NativeAdViewHolder _instance;
- private readonly Dictionary _adViews = new();
+ private readonly Dictionary _adViews = new Dictionary();
private NativeAdViewHolder() {}
diff --git a/Assets/Tapsell/Mediation/Show/ShowCourier.cs b/Assets/Tapsell/Mediation/Show/ShowCourier.cs
index 115ca0f..b28981b 100644
--- a/Assets/Tapsell/Mediation/Show/ShowCourier.cs
+++ b/Assets/Tapsell/Mediation/Show/ShowCourier.cs
@@ -7,7 +7,7 @@ namespace Tapsell.Mediation.Show
internal class ShowCourier
{
private static ShowCourier _instance;
- private readonly Dictionary _listeners = new();
+ private readonly Dictionary _listeners = new Dictionary();
private static class NativeShowAPIs
{
diff --git a/Packages/manifest.json b/Packages/manifest.json
index 0fc0d7a..c10274a 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -4,6 +4,7 @@
"com.unity.feature.2d": "2.0.0",
"com.unity.ide.rider": "3.0.24",
"com.unity.ide.visualstudio": "2.0.18",
+ "com.unity.mobile.android-logcat": "1.3.2",
"com.unity.test-framework": "1.3.7",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.8.2",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 54a53cb..3389c7e 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -166,6 +166,13 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
+ "com.unity.mobile.android-logcat": {
+ "version": "1.3.2",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
"com.unity.test-framework": {
"version": "1.3.7",
"depth": 0,
diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml
index 838012c..966bd11 100644
--- a/ProjectSettings/AndroidResolverDependencies.xml
+++ b/ProjectSettings/AndroidResolverDependencies.xml
@@ -1,12 +1,13 @@
com.google.code.gson:gson:2.8.5
- ir.tapsell.mediation.adapter:admob-unity:1.0.1-beta04
- ir.tapsell.mediation.adapter:applovin-unity:1.0.1-beta04
- ir.tapsell.mediation.adapter:ironsource-unity:1.0.1-beta04
- ir.tapsell.mediation.adapter:legacy-unity:1.0.1-beta04
- ir.tapsell.mediation.adapter:mintegral-unity:1.0.0-beta10
- ir.tapsell.mediation:tapsell-unity:1.0.1-beta04
+ ir.tapsell.mediation.adapter:admob-unity:1.0.1-beta07
+ ir.tapsell.mediation.adapter:applovin-unity:1.0.1-beta07
+ ir.tapsell.mediation.adapter:fyber-unity:1.0.1-beta07
+ ir.tapsell.mediation.adapter:ironsource-unity:1.0.1-beta07
+ ir.tapsell.mediation.adapter:legacy-unity:1.0.1-beta07
+ ir.tapsell.mediation.adapter:mintegral-unity:1.0.1-beta07
+ ir.tapsell.mediation:tapsell-unity:1.0.1-beta07