Skip to content

Commit 9030d0c

Browse files
runnerrunner
runner
authored and
runner
committed
Release 4.9.0
1 parent 4f6c0f6 commit 9030d0c

File tree

183 files changed

+2793
-2330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+2793
-2330
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "com.unity3d.ads.example"
88
minSdkVersion 19
99
targetSdkVersion 33
10-
versionCode = 4800
11-
versionName = "4.8.0"
10+
versionCode = 4900
11+
versionName = "4.9.0"
1212
}
1313

1414
buildTypes {

‎app/src/main/java/com/unity3d/ads/example/ui/main/UnityAdsFragment.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
import android.widget.RelativeLayout;
1919
import android.widget.Toast;
2020

21-
import com.unity3d.ads.IUnityAdsInitializationListener;
22-
import com.unity3d.ads.IUnityAdsLoadListener;
23-
import com.unity3d.ads.IUnityAdsShowListener;
24-
import com.unity3d.ads.UnityAds;
25-
import com.unity3d.ads.UnityAdsShowOptions;
21+
import com.unity3d.ads.*;
2622
import com.unity3d.ads.example.R;
2723
import com.unity3d.ads.metadata.MediationMetaData;
2824
import com.unity3d.ads.metadata.MetaData;
@@ -68,6 +64,7 @@ public void onBannerShown(BannerView bannerAdView) {
6864
@Override
6965
public void onBannerFailedToLoad(BannerView bannerAdView, BannerErrorInfo errorInfo) {
7066
Log.e(LOGTAG, "Unity Ads failed to load banner for " + bannerAdView.getPlacementId() + " with error: [" + errorInfo.errorCode + "] " + errorInfo.errorMessage);
67+
enableButton(showBannerButton);
7168
}
7269

7370
@Override
@@ -203,6 +200,7 @@ public void onClick(View v) {
203200
this.showBannerButton.setOnClickListener(new View.OnClickListener() {
204201
@Override
205202
public void onClick(View v) {
203+
disableButton(showBannerButton);
206204
bottomBanner = new BannerView((Activity)v.getContext(), "bannerads", new UnityBannerSize(320, 50));
207205
bottomBanner.setListener(bannerListener);
208206
bottomBanner.load();
@@ -213,11 +211,12 @@ public void onClick(View v) {
213211
hideBannerButton.setOnClickListener(new View.OnClickListener() {
214212
@Override
215213
public void onClick(View v) {
216-
bottomBanner.removeAllViews();
217214
if (bottomBanner != null) {
215+
bottomBanner.removeAllViews();
218216
bottomBanner = null;
219217
}
220-
showBannerButton.setEnabled(true);
218+
enableButton(showBannerButton);
219+
disableButton(hideBannerButton);
221220
}
222221
});
223222

‎fatAar.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ project.tasks.whenTaskAdded { Task theTask ->
3030
}
3131
if (tasksDependentOnScar("${buildType}").any { theTask.name == it }) {
3232
theTask.dependsOn(":unity-scaradapter-common:copyJars${buildType}")
33-
theTask.dependsOn(":unity-scaradapter-1920:copyJars${buildType}")
34-
theTask.dependsOn(":unity-scaradapter-1950:copyJars${buildType}")
3533
theTask.dependsOn(":unity-scaradapter-2000:copyJars${buildType}")
3634
theTask.dependsOn(":unity-scaradapter-2100:copyJars${buildType}")
3735
}

‎settings.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include ':unity-scaradapter-1920'
2-
include ':unity-scaradapter-1950'
31
include ':unity-scaradapter-2000'
42
include ':unity-scaradapter-2100'
53
include ':unity-scaradapter-common'

‎unity-ads/build.gradle‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ if (project.rootProject.file('local.properties').exists()) {
1313
ext {
1414
GROUP_ID = "com.unity3d.ads"
1515
ARTIFACT_ID = "unity-ads"
16-
VERSION_ID = "4.8.0"
17-
VERSION_CODE = 4800
16+
VERSION_ID = "4.9.0"
17+
VERSION_CODE = 4900
1818
SIGN_AAR = properties.getProperty("SIGN_AAR") ?: false
1919
}
2020

2121
android {
2222
namespace = GROUP_ID
2323
compileSdk 33
24+
compileSdkExtension 5
2425
DdmPreferences.setLogLevel("verbose")
2526
DdmPreferences.setTimeOut(10 * 60000)
2627

@@ -82,8 +83,6 @@ dependencies {
8283
implementation "com.google.android.gms:play-services-cronet:$play_services_cronet"
8384
androidTestCompileOnly project(':unity-scaradapter-2100')
8485
androidTestCompileOnly project(':unity-scaradapter-2000')
85-
androidTestCompileOnly project(':unity-scaradapter-1950')
86-
androidTestCompileOnly project(':unity-scaradapter-1920')
8786
androidTestCompileOnly project(':unity-scaradapter-common')
8887
androidTestImplementation 'junit:junit:4.13.2'
8988
androidTestImplementation 'org.mockito:mockito-core:2.28.2'
@@ -98,8 +97,6 @@ dependencies {
9897
compileOnly 'com.google.ar:core:1.0.0'
9998
compileOnly project(':unity-scaradapter-2100')
10099
compileOnly project(':unity-scaradapter-2000')
101-
compileOnly project(':unity-scaradapter-1950')
102-
compileOnly project(':unity-scaradapter-1920')
103100
compileOnly project(':unity-scaradapter-common')
104101
testImplementation 'junit:junit:4.13.2'
105102
testImplementation "org.jetbrains.kotlin:kotlin-stdlib"

‎unity-ads/src/androidTest/java/com/unity3d/ads/test/instrumentation/services/ads/gmascar/GMAScarAdapterBridgeTest.java‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
import android.app.Activity;
1111
import android.content.Context;
1212

13+
import android.widget.RelativeLayout;
1314
import com.unity3d.scar.adapter.common.IScarAdapter;
15+
import com.unity3d.scar.adapter.common.IScarBannerAdListenerWrapper;
1416
import com.unity3d.scar.adapter.common.IScarInterstitialAdListenerWrapper;
1517
import com.unity3d.scar.adapter.common.IScarRewardedAdListenerWrapper;
1618
import com.unity3d.scar.adapter.common.scarads.ScarAdMetadata;
19+
import com.unity3d.scar.adapter.common.scarads.UnityAdFormat;
1720
import com.unity3d.scar.adapter.common.signals.ISignalCollectionListener;
1821
import com.unity3d.services.ads.gmascar.GMAScarAdapterBridge;
1922
import com.unity3d.services.ads.gmascar.adapters.ScarAdapterFactory;
@@ -64,19 +67,19 @@ public class GMAScarAdapterBridgeTest {
6467
private static final ScarAdapterVersion VERSION = ScarAdapterVersion.V21;
6568
private GMAScarAdapterBridge gmaScarAdapterBridge;
6669
private IScarAdapter scarAdapter;
70+
private boolean isBannerSignalEnabled = true;
6771

6872
@Before
6973
public void setup() {
7074
scarAdapter = new IScarAdapter() {
7175
@Override
72-
public void getSCARSignals(Context context, String[] strings,
73-
String[] strings1,
74-
ISignalCollectionListener iSignalCollectionListener) {
76+
public void getSCARSignal(Context context, String placementId, UnityAdFormat adFormat, ISignalCollectionListener signalCompletionListener) {
7577

7678
}
7779

7880
@Override
7981
public void getSCARBiddingSignals(Context context,
82+
boolean isBannerEnabled,
8083
ISignalCollectionListener iSignalCollectionListener) {
8184
iSignalCollectionListener.onSignalsCollected(SIGNAL);
8285
}
@@ -95,6 +98,11 @@ public void loadRewardedAd(Context context,
9598

9699
}
97100

101+
@Override
102+
public void loadBannerAd(Context context, RelativeLayout bannerView, ScarAdMetadata scarAdMetadata, int width, int height, IScarBannerAdListenerWrapper adListener) {
103+
104+
}
105+
98106
@Override
99107
public void show(Activity activity, String s, String s1) {
100108

@@ -189,7 +197,7 @@ public void testSignalsCollectedWhenGetScarBiddingSignalsCalled() {
189197
gmaEventSenderMock
190198
);
191199

192-
gmaScarAdapterBridge.getSCARBiddingSignals(handler);
200+
gmaScarAdapterBridge.getSCARBiddingSignals(isBannerSignalEnabled, handler);
193201
verify(handler, times(0)).onSignalsCollectionFailed(anyString());
194202
verify(handler, times(1)).onSignalsCollected(SIGNAL);
195203
}
@@ -208,7 +216,7 @@ public void testFailToCollectSignalsWhenNoBiddingSupport() {
208216
gmaEventSenderMock
209217
);
210218

211-
gmaScarAdapterBridge.getSCARBiddingSignals(handler);
219+
gmaScarAdapterBridge.getSCARBiddingSignals(isBannerSignalEnabled, handler);
212220
verify(handler, times(0)).onSignalsCollected(anyString());
213221
verify(handler, times(1)).onSignalsCollectionFailed("SCAR bidding unsupported.");
214222
}
@@ -228,7 +236,7 @@ public void testFailToCollectSignalsWhenAdapterCannotBeCreated() {
228236
gmaEventSenderMock
229237
);
230238

231-
gmaScarAdapterBridge.getSCARBiddingSignals(handler);
239+
gmaScarAdapterBridge.getSCARBiddingSignals(isBannerSignalEnabled, handler);
232240
verify(handler, times(0)).onSignalsCollected(SIGNAL);
233241
verify(handler, times(1)).onSignalsCollectionFailed("Could not create SCAR adapter object.");
234242
}

‎unity-ads/src/androidTest/java/com/unity3d/ads/test/instrumentation/services/ads/gmascar/adapters/ScarAdapterFactoryTest.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,6 @@ public class ScarAdapterFactoryTest {
1919

2020
private final ScarAdapterFactory _scarAdapterFactory = new ScarAdapterFactory();
2121

22-
@Test
23-
public void testScarAdapterFactory1920() {
24-
IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterVersion.V192, adsErrorHandlerMock);
25-
Assert.assertTrue(adapter instanceof com.unity3d.scar.adapter.v1920.ScarAdapter);
26-
}
27-
28-
@Test
29-
public void testScarAdapterFactory1950() {
30-
IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterVersion.V195, adsErrorHandlerMock);
31-
Assert.assertTrue(adapter instanceof com.unity3d.scar.adapter.v1950.ScarAdapter);
32-
}
33-
3422
@Test
3523
public void testScarAdapterFactory2000() {
3624
IScarAdapter adapter = _scarAdapterFactory.createScarAdapter(ScarAdapterVersion.V20, adsErrorHandlerMock);

‎unity-ads/src/androidTest/java/com/unity3d/ads/test/instrumentation/services/ads/gmascar/bridges/MobileAdsBridgeLegacyTest.java‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,6 @@ public void testMobileAdsBridgeV21GetVersion() {
3434
Assert.assertTrue(String.format("Minor version 223712000 is not found in %s", versionString), versionString.contains("223712000"));
3535
}
3636

37-
@Test
38-
public void testGetAdapterVersionWhen192() {
39-
MobileAdsBridgeLegacy mobileAdsBridge = new MobileAdsBridgeLegacy();
40-
ScarAdapterVersion adapterVersion = mobileAdsBridge.getAdapterVersion(MobileAdsBridgeLegacy.CODE_19_2);
41-
Assert.assertEquals(ScarAdapterVersion.V192, adapterVersion);
42-
}
43-
44-
@Test
45-
public void testGetAdapterVersionWhen195() {
46-
MobileAdsBridgeLegacy mobileAdsBridge = new MobileAdsBridgeLegacy();
47-
ScarAdapterVersion adapterVersion = mobileAdsBridge.getAdapterVersion(MobileAdsBridgeLegacy.CODE_19_5);
48-
Assert.assertEquals(ScarAdapterVersion.V195, adapterVersion);
49-
}
50-
51-
@Test
52-
public void testGetAdapterVersionWhen198() {
53-
MobileAdsBridgeLegacy mobileAdsBridge = new MobileAdsBridgeLegacy();
54-
ScarAdapterVersion adapterVersion = mobileAdsBridge.getAdapterVersion(MobileAdsBridgeLegacy.CODE_19_8);
55-
Assert.assertEquals(ScarAdapterVersion.V195, adapterVersion);
56-
}
57-
5837
@Test
5938
public void testGetAdapterVersionWhen20() {
6039
MobileAdsBridgeLegacy mobileAdsBridge = new MobileAdsBridgeLegacy();

‎unity-ads/src/androidTest/java/com/unity3d/ads/test/instrumentation/services/ads/gmascar/finder/ScarVersionFinderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public void setup() {
3838
public void testScarVersionFinderWithMobileAdsBridgeLegacy() {
3939
doCallRealMethod().when(mobileAdsBridgeMock).getVersionCodeIndex();
4040

41-
Mockito.when(mobileAdsBridgeMock.getVersionString()).thenReturn("afma-sdk-a-v204890999.203404000.1");
41+
Mockito.when(mobileAdsBridgeMock.getVersionString()).thenReturn("afma-sdk-a-v204890999.210402000.1");
4242
ScarVersionFinder scarVersionFinder = new ScarVersionFinder(mobileAdsBridgeMock, presenceDetector, gmaInitializer, new GMAEventSender());
4343
long versionCode = scarVersionFinder.getVersionCode();
44-
Assert.assertEquals(MobileAdsBridgeLegacy.CODE_19_5, versionCode);
44+
Assert.assertEquals(MobileAdsBridgeLegacy.CODE_20_0, versionCode);
4545
}
4646

4747
@Test

‎unity-ads/src/androidTest/java/com/unity3d/ads/test/instrumentation/services/ads/gmascar/handlers/BiddingSignalsHandlerTest.java‎

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,21 @@ public class BiddingSignalsHandlerTest {
2222

2323
@Test
2424
public void testSignalsAreSetAfterOnSignalsCollectedWithValidMap() {
25-
String map = "{\"gmaScarBiddingRewardedSignal\": \"rvSig\",\"gmaScarBiddingInterstitialSignal\": \"inSig\"}";
25+
String map = "{\"gmaScarBiddingRewardedSignal\": \"rvSig\",\"gmaScarBiddingInterstitialSignal\": \"inSig\", \"gmaScarBiddingBannerSignal\": \"bnSig\"}";
2626
gmaScarBiddingSignalsListener = spy(new IBiddingSignalsListener() {
2727
@Override
2828
public void onSignalsReady(BiddingSignals signals) {
2929
assertEquals("rvSig", signals.getRvSignal());
3030
assertEquals("inSig", signals.getInterstitialSignal());
31+
assertEquals("bnSig", signals.getBannerSignal());
3132
}
3233

3334
@Override
3435
public void onSignalsFailure(String msg) {
3536
fail();
3637
}
3738
});
38-
biddingSignalsHandler = new BiddingSignalsHandler(gmaScarBiddingSignalsListener);
39+
biddingSignalsHandler = new BiddingSignalsHandler(true, gmaScarBiddingSignalsListener);
3940

4041
biddingSignalsHandler.onSignalsCollected(map);
4142
verify(gmaScarBiddingSignalsListener, times(1)).onSignalsReady(
@@ -44,21 +45,70 @@ public void onSignalsFailure(String msg) {
4445

4546
@Test
4647
public void testNoInterstitialSignalSetAfterOnSignalsCollectedWithMissingInterstitial() {
47-
String map = "{\"gmaScarBiddingRewardedSignal\": \"rvSig\",\"asdfasdfasf\": \"inSig\"}";
48+
String map = "{\"gmaScarBiddingRewardedSignal\": \"rvSig\", \"gmaScarBiddingBannerSignal\": \"bnSig\"}";
4849

4950
gmaScarBiddingSignalsListener = spy(new IBiddingSignalsListener() {
5051
@Override
5152
public void onSignalsReady(BiddingSignals signals) {
5253
assertEquals("rvSig", signals.getRvSignal());
5354
assertEquals("", signals.getInterstitialSignal());
55+
assertEquals("bnSig", signals.getBannerSignal());
56+
}
57+
58+
@Override
59+
public void onSignalsFailure(String msg) {
60+
fail();
61+
}
62+
});
63+
biddingSignalsHandler = new BiddingSignalsHandler(true, gmaScarBiddingSignalsListener);
64+
65+
biddingSignalsHandler.onSignalsCollected(map);
66+
verify(gmaScarBiddingSignalsListener, times(1)).onSignalsReady(
67+
isA(BiddingSignals.class));
68+
}
69+
70+
@Test
71+
public void testNoBannerSignalSetAfterOnSignalsCollectedWithBannerDisabled() {
72+
String map = "{\"gmaScarBiddingRewardedSignal\": \"rvSig\",\"gmaScarBiddingInterstitialSignal\": \"inSig\"}";
73+
74+
gmaScarBiddingSignalsListener = spy(new IBiddingSignalsListener() {
75+
@Override
76+
public void onSignalsReady(BiddingSignals signals) {
77+
assertEquals("rvSig", signals.getRvSignal());
78+
assertEquals("inSig", signals.getInterstitialSignal());
79+
assertEquals("", signals.getBannerSignal());
80+
}
81+
82+
@Override
83+
public void onSignalsFailure(String msg) {
84+
fail();
85+
}
86+
});
87+
biddingSignalsHandler = new BiddingSignalsHandler(false, gmaScarBiddingSignalsListener);
88+
89+
biddingSignalsHandler.onSignalsCollected(map);
90+
verify(gmaScarBiddingSignalsListener, times(1)).onSignalsReady(
91+
isA(BiddingSignals.class));
92+
}
93+
94+
@Test
95+
public void testNoBannerSignalSetAfterOnSignalsCollectedWithBannerPresent() {
96+
String map = "{\"gmaScarBiddingRewardedSignal\": \"rvSig\",\"gmaScarBiddingInterstitialSignal\": \"inSig\", \"gmaScarBiddingBannerSignal\": \"bnSig\"}";
97+
98+
gmaScarBiddingSignalsListener = spy(new IBiddingSignalsListener() {
99+
@Override
100+
public void onSignalsReady(BiddingSignals signals) {
101+
assertEquals("rvSig", signals.getRvSignal());
102+
assertEquals("inSig", signals.getInterstitialSignal());
103+
assertEquals("", signals.getBannerSignal());
54104
}
55105

56106
@Override
57107
public void onSignalsFailure(String msg) {
58108
fail();
59109
}
60110
});
61-
biddingSignalsHandler = new BiddingSignalsHandler(gmaScarBiddingSignalsListener);
111+
biddingSignalsHandler = new BiddingSignalsHandler(false, gmaScarBiddingSignalsListener);
62112

63113
biddingSignalsHandler.onSignalsCollected(map);
64114
verify(gmaScarBiddingSignalsListener, times(1)).onSignalsReady(
@@ -80,7 +130,7 @@ public void onSignalsFailure(String msg) {
80130
fail();
81131
}
82132
});
83-
biddingSignalsHandler = new BiddingSignalsHandler(gmaScarBiddingSignalsListener);
133+
biddingSignalsHandler = new BiddingSignalsHandler(false, gmaScarBiddingSignalsListener);
84134

85135
biddingSignalsHandler.onSignalsCollected(map);
86136
verify(gmaScarBiddingSignalsListener, times(1)).onSignalsReady(

0 commit comments

Comments
 (0)