Skip to content

Commit 1e2303a

Browse files
maninbox1maninbox1
authored
Merge pull request #5 from bidmachine/develop-1.1.0
prepare release 1.1.0
2 parents 40471bb + f162ff5 commit 1e2303a

12 files changed

Lines changed: 94 additions & 25 deletions

File tree

‎Assets/BidMachine/Api/BidMachine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private static IBidMachine getInstance()
2525
return client ?? (client = BidMachineClientFactory.GetBidMachine());
2626
}
2727

28-
public static string BIDMACHINE_UNITY_PLUGIN_VERSION = "1.0.9";
28+
public static string BIDMACHINE_UNITY_PLUGIN_VERSION = "1.1.0";
2929

3030
/// <summary>
3131
/// Initializes BidMachine SDK.

‎Assets/BidMachine/Demo/BidMachineDemoController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void BidMachineInitialize()
9393
BidMachine.checkAndroidPermissions(Permission.CoarseLocation);
9494
BidMachine.setLoggingEnabled(tgLogging.isOn);
9595
BidMachine.setTestMode(tgTesting.isOn);
96-
BidMachine.initialize("1");
96+
BidMachine.initialize("5");
9797
}
9898

9999
public void IsInitialized()
@@ -151,7 +151,6 @@ public void DestroyBanner()
151151
{
152152
if (bannerView != null)
153153
{
154-
bannerView.hideBannerView();
155154
bannerView.destroy();
156155
bannerView = null;
157156
bannerRequest = null;
@@ -190,8 +189,9 @@ public void LoadNativeAd()
190189
nativeAd.load(nativeRequest);
191190
}
192191
}
193-
}
192+
}
194193
}
194+
195195

196196
public void DestroyNativeAd()
197197
{

‎Assets/BidMachine/Editor/BidMachineDependencies.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<dependencies>
22
<iosPods>
3-
<iosPod name='BidMachine' version='1.9.4.3' minTargetSdk='10.0'/>
3+
<iosPod name='BidMachine' version='1.9.4.5' minTargetSdk='10.0'/>
44
<iosPod name='BDMIABAdapter' version='1.9.4.0' minTargetSdk='10.0'/>
55
</iosPods>
66
<androidPackages>
7-
<androidPackage spec='io.bidmachine:ads:1.9.6'/>
8-
<androidPackage spec='io.bidmachine:ads.extensions.unity:1.9.6.+'/>
7+
<androidPackage spec='io.bidmachine:ads:1.9.8'/>
8+
<androidPackage spec='io.bidmachine:ads.extensions.unity:1.9.8.+'/>
99
<repositories>
1010
<repository>https://artifactory.bidmachine.io/bidmachine</repository>
1111
</repositories>

‎Assets/BidMachine/Editor/BidMachineSettings.cs‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,21 @@
22
using UnityEditor;
33
using UnityEngine;
44

5-
public class BidMachineSettings : ScriptableObject
5+
namespace BidMachine.Unity.Editor.Utils
66
{
7-
[MenuItem("BidMachine/SDK Documentation")]
8-
public static void OpenDocumentation()
7+
public class BidMachineSettings : ScriptableObject
98
{
10-
Application.OpenURL("https://docs.bidmachine.io/docs");
9+
[MenuItem("BidMachine/SDK Documentation")]
10+
public static void OpenDocumentation()
11+
{
12+
Application.OpenURL("https://docs.bidmachine.io/docs");
13+
}
14+
[MenuItem("BidMachine/Remove plugin")]
15+
public static void RemoveBidmachinePlugin()
16+
{
17+
RemoveHelper.RemovePlugin();
18+
}
19+
1120
}
1221
}
1322
#endif

‎Assets/BidMachine/Editor/RemoveHelper.cs‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#pragma warning disable 0649
2+
using System.IO;
3+
using UnityEditor;
4+
using System.Text.RegularExpressions;
5+
using UnityEngine;
6+
// using System.Collections.Generic;
7+
using System.Diagnostics.CodeAnalysis;
8+
// using System.Linq;
9+
10+
namespace BidMachine.Unity.Editor.Utils
11+
{
12+
[System.Serializable]
13+
[SuppressMessage("ReSharper", "InconsistentNaming")]
14+
15+
16+
[InitializeOnLoad]
17+
[SuppressMessage("ReSharper", "InconsistentNaming")]
18+
[SuppressMessage("ReSharper", "RedundantJumpStatement")]
19+
[SuppressMessage("ReSharper", "UnusedMember.Local")]
20+
[SuppressMessage("ReSharper", "UnusedMember.Global")]
21+
public class RemoveHelper
22+
{
23+
24+
public static void RemovePlugin(bool isCleanBeforeUpdate = false)
25+
{
26+
if (EditorUtility.DisplayDialog("Remove BidMachine plugin",
27+
"Are you sure you want to remove the BidMachine plugin from your project?",
28+
"Yes",
29+
"Cancel"))
30+
{
31+
32+
FileUtil.DeleteFileOrDirectory(Path.Combine(Application.dataPath, "Plugins/Android"));
33+
FileUtil.DeleteFileOrDirectory(Path.Combine(Application.dataPath, "Plugins/iOS"));
34+
FileUtil.DeleteFileOrDirectory(Path.Combine(Application.dataPath, "BidMachine"));
35+
36+
FileUtil.DeleteFileOrDirectory(Path.Combine(Application.dataPath, "Plugins/Android" + ".meta"));
37+
FileUtil.DeleteFileOrDirectory(Path.Combine(Application.dataPath, "Plugins/iOS" + ".meta"));
38+
FileUtil.DeleteFileOrDirectory(Path.Combine(Application.dataPath, "BidMachine" + ".meta"));
39+
40+
AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
41+
42+
}
43+
}
44+
45+
}
46+
}

‎Assets/BidMachine/Platforms/Android/AndroidBidMachine.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,6 @@ public void setPriceFloorParams(PriceFloorParams priceFloorParams)
567567

568568
public IBannerRequest build()
569569
{
570-
bannerRequest = new AndroidJavaObject("io.bidmachine.banner.BannerRequest");
571570
bannerRequest = getBannerRequestBuilder().Call<AndroidJavaObject>("build");
572571
return new AndroidBannerRequest(bannerRequest);
573572
}
@@ -689,7 +688,6 @@ public void setTargetingParams(TargetingParams targetingParams)
689688

690689
public IInterstitialRequest build()
691690
{
692-
interstitialRequest = new AndroidJavaObject("io.bidmachine.interstitial.InterstitialRequest");
693691
interstitialRequest = getInterstitialBuilder().Call<AndroidJavaObject>("build");
694692
return new AndroidInterstitialRequest(interstitialRequest);
695693
}
@@ -781,7 +779,6 @@ public void setNetworks(string networks)
781779

782780
public IRewardedRequest build()
783781
{
784-
rewardedRequest = new AndroidJavaObject("io.bidmachine.interstitial.InterstitialRequest");
785782
rewardedRequest = getRewardedRequestBuilder().Call<AndroidJavaObject>("build");
786783
return new AndroidRewardedRequest(rewardedRequest);
787784
}
@@ -904,7 +901,6 @@ public void setListener(INativeRequestListener nativeRequestListener)
904901

905902
public INativeRequest build()
906903
{
907-
jNativeRequest = new AndroidJavaObject("io.bidmachine.interstitial.InterstitialRequest");
908904
jNativeRequest = getNativeRequestBuilder().Call<AndroidJavaObject>("build");
909905
return new AndroidNativeRequest(jNativeRequest);
910906
}

‎Assets/Plugins/Android/AndroidManifest.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
3+
<manifest
4+
xmlns:android="http://schemas.android.com/apk/res/android"
5+
package="com.unity3d.player"
6+
xmlns:tools="http://schemas.android.com/tools">
7+
<application>
8+
<activity android:name="com.unity3d.player.UnityPlayerActivity"
9+
android:theme="@style/UnityThemeSelector">
10+
<intent-filter>
11+
<action android:name="android.intent.action.MAIN" />
12+
<category android:name="android.intent.category.LAUNCHER" />
13+
</intent-filter>
14+
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
15+
</activity>
16+
</application>
17+
</manifest>

‎Assets/Plugins/Android/bidmachine.androidlib/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
android.library=true
2-
target=android-25
2+
target=android-28

‎Assets/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
1.1 Download BidMachine Unity Plugin that includes the newest Android and iOS BidMachine SDK with major improvements.
44

5-
1.2 To import the BidMachine Unity plugin, double-click on the BidMachine-Unity-Plugin-1.0.9-05.07.2022.unitypackage , or go to Assets → Import Package → Custom Package . Keep all the files in the Importing Package window selected, and click Import .
5+
1.2 To import the BidMachine Unity plugin, double-click on the BidMachine-Unity-Plugin-1.1.0-01.08.2022.unitypackage , or go to Assets → Import Package → Custom Package . Keep all the files in the Importing Package window selected, and click Import .
66

77
# Step 2. Project configuration
88

99
2.1 Android
1010

1111
Requirements:
12-
- Min Android SDK version - 15 (4.0.3 - 4.0.4, Ice Cream Sandwich).
12+
- Min Android SDK version - 16 (4.1, Jelly Bean).
1313

1414
2.1.1 External Dependency Manager (Play Services Resolver)
1515
BidMachine Unity Plugin includes External Dependency Manager package. You need to complete these following steps to resolve BidMachine's dependencies:

‎ProjectSettings/AndroidResolverDependencies.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<dependencies>
22
<packages>
3-
<package>io.bidmachine:ads.extensions.unity:1.9.6.+</package>
4-
<package>io.bidmachine:ads:1.9.6</package>
3+
<package>io.bidmachine:ads.extensions.unity:1.9.8.+</package>
4+
<package>io.bidmachine:ads:1.9.8</package>
55
</packages>
66
<files />
77
<settings>
88
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
9-
<setting name="bundleId" value="com.unicostudio.braintest2new" />
9+
<setting name="bundleId" value="com.bidmachine.testIssue" />
1010
<setting name="explodeAars" value="True" />
1111
<setting name="gradleBuildEnabled" value="True" />
1212
<setting name="gradlePropertiesTemplateEnabled" value="True" />

0 commit comments

Comments
 (0)