Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce Rendering API #305

Merged
merged 32 commits into from
Dec 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e169e8c
MOBILE-6999: Introduce the rendering module in prebid app (#1)
KostiantynTselykh Apr 7, 2021
d0767e8
MOBILE-7002: Rename modules and products (#2)
KostiantynTselykh Apr 8, 2021
27b986e
MOBILE-7013: Introduce ability to set custom host for pbs (#3)
KostiantynTselykh Apr 8, 2021
138c913
MOBILE-7010: Rename classes and methods (#4)
KostiantynTselykh Apr 13, 2021
123918b
MOBILE-7037: Update mockito dependency (#5)
KostiantynTselykh Apr 15, 2021
c3ea3f2
MOBILE-7007: Rename config keys (#6)
KostiantynTselykh Apr 15, 2021
51671e4
MOBILE-7043: Rename file signature (copyright) (#7)
KostiantynTselykh Apr 15, 2021
d723292
MOBILE-7049: Sync support of GDPR and CCPA (#8)
KostiantynTselykh Apr 19, 2021
904f2b2
MOBILE-7046: Replace OM SDK with prebid version (#9)
KostiantynTselykh Apr 19, 2021
8c46798
MOBILE-7055: Update GAM to latest version (#10)
KostiantynTselykh Apr 22, 2021
99e89cb
MOBILE-7053: Update MoPub version in adapters (#11)
KostiantynTselykh Apr 22, 2021
28c00b4
MOBILE-7044: Remove AdChoices functionality (#12)
KostiantynTselykh Apr 26, 2021
a0ae3ae
MOBILE-7056: Introduce rendering module as part of Prebid (#13)
KostiantynTselykh Apr 28, 2021
69fc1f2
MOBILE-7057: Remove OX OXB prefixes (#14)
KostiantynTselykh Apr 28, 2021
fa74450
fix(buildPrebidMobile.sh):
KostiantynTselykh Apr 29, 2021
c4d8634
chore:
KostiantynTselykh May 17, 2021
5e58683
fix(UserConsentManager):
KostiantynTselykh Jun 1, 2021
3bcb227
MOBILE-7080: Sync request params with Prebid (#18)
KostiantynTselykh Jun 10, 2021
73d56d7
MOBILE-7090: Restore sending of OM event tracker (#19)
KostiantynTselykh Jun 15, 2021
9dc5060
Add switcher to demo app for GDPR
KostiantynTselykh Aug 9, 2021
f7b10b8
Merge pull request #272 from openx/feature-rendering-module
YuriyVelichkoPI Oct 21, 2021
567394f
Migration of rendering module and reviving unit tests. (#281)
ValentinPostindustria Nov 1, 2021
410867c
Add in-app with gam example in PrebidInternalTestApp (#276) (#284)
ValentinPostindustria Nov 5, 2021
d72dc51
Fixed broken instrumented tests. (#285)
ValentinPostindustria Nov 10, 2021
941db8f
Make native ad from rendering private, comment tests with native from…
ValentinPostindustria Nov 16, 2021
ccd52f6
Added integration examples with rendering to PrebidDemoKotlin (#295)
ValentinPostindustria Nov 19, 2021
60b0b1b
Created mediation api for scalable connecting mediation platforms (#299)
ValentinPostindustria Nov 24, 2021
fd8b9a7
Actualize build and test scripts #293 (#301)
ValentinPostindustria Nov 26, 2021
f929a88
Added content url field onto rendering API (#302)
ValentinPostindustria Nov 29, 2021
9b91ae3
Provide access to the bid response #297 (#304)
ValentinPostindustria Nov 29, 2021
03ffd96
Migrate project to AndroidX #294 (#298)
ValentinPostindustria Dec 2, 2021
93722a9
Merge branch 'master' into feature/rendering
ValentinPostindustria Dec 2, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 8 additions & 8 deletions Example/PrebidDemoJava/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,20 @@ dependencies {
implementation 'com.google.android.exoplayer:exoplayer-core:2.11.1'
implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.1'
implementation 'com.google.android.exoplayer:extension-ima:2.11.1'
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.multidex:multidex:2.0.0'
implementation('com.mopub:mopub-sdk:5.8.0@aar') {
transitive = true

exclude module: 'libAvid-mopub' // To exclude AVID
exclude module: 'moat-mobile-app-kit' // To exclude Moat
}

androidTestImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation 'androidx.test:rules:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-web:3.1.1'
androidTestImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test:rules:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-web:3.4.0'
androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.2.0'
androidTestImplementation 'org.mockito:mockito-android:2.24.0'
androidTestImplementation 'org.mockito:mockito-android:4.0.0'
}
36 changes: 24 additions & 12 deletions Example/PrebidDemoKotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 28
buildToolsVersion "29.0.0"
compileSdkVersion 30
buildToolsVersion "29.0.2"
defaultConfig {
applicationId "org.prebid.mobile.prebidkotlindemo"
minSdkVersion 16
targetSdkVersion 28
minSdkVersion 19
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -22,25 +22,37 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
buildFeatures {
dataBinding true
}
}

dependencies {

implementation 'com.android.support:multidex:1.0.3'

implementation project(':PrebidMobile')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':PrebidMobile-gamEventHandlers')
implementation project(':PrebidMobile-mopubAdapters')

// Standard libraries
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'com.google.android.gms:play-services-ads:20.0.0'
implementation('com.mopub:mopub-sdk:5.4.1@aar') {
transitive = true
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.preference:preference-ktx:1.1.1'

// Advertisement
implementation 'com.google.android.gms:play-services-ads:20.4.0'
implementation('com.mopub:mopub-sdk:5.17.0@aar') {
transitive = true
exclude module: 'libAvid-mopub' // To exclude AVID
exclude module: 'moat-mobile-app-kit' // To exclude Moat
}

// Multidex
implementation 'androidx.multidex:multidex:2.0.0'

// Tests
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
package org.prebid.mobile.prebidkotlindemo

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import android.content.Context
import androidx.test.core.app.ApplicationProvider
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(androidx.test.ext.junit.runners.AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = androidx.test.platform.app.InstrumentationRegistry.getTargetContext()
assertEquals("org.prebid.mobile.prebidkotlindemo", appContext.packageName)
val context = ApplicationProvider.getApplicationContext<Context>()
assertEquals("org.prebid.mobile.prebidkotlindemo", context.packageName)
}
}
27 changes: 16 additions & 11 deletions Example/PrebidDemoKotlin/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
package="org.prebid.mobile.prebidkotlindemo">

<!-- Required permissions -->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

<!-- Optional permissions. Will pass Lat/Lon values when available. Choose either Coarse or Fine -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

<!-- Optional permissions. Used for MRAID 2.0 storePicture ads -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

<application
android:name=".CustomApplication"
android:allowBackup="true"
Expand All @@ -22,30 +24,33 @@
<meta-data
android:name="com.google.android.gms.ads.AD_MANAGER_APP"
android:value="true"/>

<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity android:name=".DemoActivity" />
<activity android:name=".DemoActivity"/>

<!--MoPub Activities-->
<activity
android:name="com.mopub.mobileads.MoPubActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
android:configChanges="keyboardHidden|orientation|screenSize"/>
<activity
android:name="com.mopub.mobileads.MraidActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
android:configChanges="keyboardHidden|orientation|screenSize"/>
<activity
android:name="com.mopub.mobileads.RewardedMraidActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
android:configChanges="keyboardHidden|orientation|screenSize"/>
<activity
android:name="com.mopub.common.MoPubBrowser"
android:configChanges="keyboardHidden|orientation|screenSize" />
android:configChanges="keyboardHidden|orientation|screenSize"/>
<activity
android:name="com.mopub.mobileads.MraidVideoPlayerActivity"
android:configChanges="keyboardHidden|orientation|screenSize" />
android:configChanges="keyboardHidden|orientation|screenSize"/>

</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package org.prebid.mobile.prebidkotlindemo

import android.app.Activity
import android.view.ViewGroup

data class AdType(
var name: String,
var onCreate: (activity: Activity, wrapper: ViewGroup, autoRefreshTime: Int) -> Unit,
var onDestroy: (() -> Unit)? = null
)
Loading