Skip to content

Commit ab8806a

Browse files
Mobile Ads Developer Relationscopybara-github
authored andcommitted
Maps AgeRestrictedTreatment to Line's ChildDirectedTreatment API.
PiperOrigin-RevId: 922258576
1 parent 60f2167 commit ab8806a

5 files changed

Lines changed: 47 additions & 6 deletions

File tree

ThirdPartyAdapters/line/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## LINE Android Mediation Adapter Changelog
22

3+
#### Next Version
4+
- Maps `AgeRestrictedTreatment` to Line's ChildDirectedTreatment API.
5+
36
#### Version 3.1.1.0 (In progress)
47

58
#### Version 3.1.0.0

ThirdPartyAdapters/line/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
ext {
4-
kotlinVersion = '2.1.10'
4+
kotlinVersion = '2.3.0'
55
}
66
repositories {
77
google()

ThirdPartyAdapters/line/line/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,16 @@ dependencies {
136136
implementation 'androidx.core:core-ktx:1.8.0'
137137
// Check for a 'useNextGenGma' flag to use the next generation GMA SDK.
138138
if (project.hasProperty('useNextGenGma')) {
139-
implementation 'com.google.android.libraries.ads.mobile.sdk:ads-mobile-sdk:1.0.1'
139+
implementation 'com.google.android.libraries.ads.mobile.sdk:ads-mobile-sdk:1.1.0'
140140
} else {
141-
implementation 'com.google.android.gms:play-services-ads:25.2.0'
141+
implementation 'com.google.android.gms:play-services-ads:25.3.0'
142142
}
143143
implementation 'com.linecorp.adsnetwork:fivead:3.1.1'
144-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0'
144+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.3.0'
145145
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
146146
testImplementation 'junit:junit:4.13.2'
147147
testImplementation 'androidx.test:core:1.5.0'
148-
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10'
148+
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib:2.3.0'
149149
testImplementation 'org.mockito:mockito-core:5.5.0'
150150
testImplementation "org.jacoco:org.jacoco.core:$jacocoVersion"
151151
testImplementation 'androidx.test.ext:junit-ktx:1.1.5'

ThirdPartyAdapters/line/line/src/main/java/com/google/ads/mediation/line/LineInitializer.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import android.content.Context
1818
import androidx.annotation.VisibleForTesting
1919
import com.five_corp.ad.FiveAdConfig
2020
import com.five_corp.ad.NeedChildDirectedTreatment
21+
import com.google.android.gms.ads.AgeRestrictedTreatment
2122
import com.google.android.gms.ads.MobileAds
2223
import com.google.android.gms.ads.RequestConfiguration
2324

@@ -49,7 +50,8 @@ object LineInitializer {
4950
requestConfiguration.tagForChildDirectedTreatment ==
5051
RequestConfiguration.TAG_FOR_CHILD_DIRECTED_TREATMENT_TRUE ||
5152
requestConfiguration.tagForUnderAgeOfConsent ==
52-
RequestConfiguration.TAG_FOR_UNDER_AGE_OF_CONSENT_TRUE
53+
RequestConfiguration.TAG_FOR_UNDER_AGE_OF_CONSENT_TRUE ||
54+
requestConfiguration.ageRestrictedTreatment == AgeRestrictedTreatment.CHILD
5355
) {
5456
fiveAdConfig?.needChildDirectedTreatment = NeedChildDirectedTreatment.TRUE
5557
} else if (

ThirdPartyAdapters/line/line/src/test/java/com/google/ads/mediation/line/LineMediationAdapterTest.kt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.google.ads.mediation.line.LineMediationAdapter.Companion.SDK_ERROR_DO
3131
import com.google.android.gms.ads.AdError
3232
import com.google.android.gms.ads.AdFormat
3333
import com.google.android.gms.ads.AdSize
34+
import com.google.android.gms.ads.AgeRestrictedTreatment
3435
import com.google.android.gms.ads.MobileAds
3536
import com.google.android.gms.ads.RequestConfiguration
3637
import com.google.android.gms.ads.VersionInfo
@@ -368,6 +369,41 @@ class LineMediationAdapterTest {
368369
.isEqualTo(NeedChildDirectedTreatment.UNSPECIFIED)
369370
}
370371

372+
@Test
373+
fun initialize_withAgeRestrictedTreatmentChild_configuresFiveAdSDKWithTrue() {
374+
val requestConfiguration =
375+
RequestConfiguration.Builder().setAgeRestrictedTreatment(AgeRestrictedTreatment.CHILD).build()
376+
MobileAds.setRequestConfiguration(requestConfiguration)
377+
val serverParameters = bundleOf(KEY_APP_ID to TEST_APP_ID_1)
378+
val mediationConfiguration = createMediationConfiguration(AdFormat.BANNER, serverParameters)
379+
380+
lineMediationAdapter.initialize(
381+
context,
382+
mockInitializationCompleteCallback,
383+
listOf(mediationConfiguration),
384+
)
385+
386+
assertThat(fiveAdConfig.needChildDirectedTreatment).isEqualTo(NeedChildDirectedTreatment.TRUE)
387+
}
388+
389+
@Test
390+
fun initialize_withAgeRestrictedTreatmentTeen_configuresFiveAdSDKWithUnspecified() {
391+
val requestConfiguration =
392+
RequestConfiguration.Builder().setAgeRestrictedTreatment(AgeRestrictedTreatment.TEEN).build()
393+
MobileAds.setRequestConfiguration(requestConfiguration)
394+
val serverParameters = bundleOf(KEY_APP_ID to TEST_APP_ID_1)
395+
val mediationConfiguration = createMediationConfiguration(AdFormat.BANNER, serverParameters)
396+
397+
lineMediationAdapter.initialize(
398+
context,
399+
mockInitializationCompleteCallback,
400+
listOf(mediationConfiguration),
401+
)
402+
403+
assertThat(fiveAdConfig.needChildDirectedTreatment)
404+
.isEqualTo(NeedChildDirectedTreatment.UNSPECIFIED)
405+
}
406+
371407
@Test
372408
fun initialize_withTestModeTrue_configuresTestModeToTrueOnLineSdk() {
373409
val serverParameters = bundleOf(KEY_APP_ID to TEST_APP_ID_1)

0 commit comments

Comments
 (0)