diff --git a/Example/PrebidDemoKotlin/build.gradle b/Example/PrebidDemoKotlin/build.gradle index d1b52801e..69ec174eb 100644 --- a/Example/PrebidDemoKotlin/build.gradle +++ b/Example/PrebidDemoKotlin/build.gradle @@ -35,11 +35,13 @@ dependencies { implementation project(':PrebidMobile') implementation project(':PrebidMobile-gamEventHandlers') implementation project(':PrebidMobile-mopubAdapters') + implementation project(':PrebidMobile-admobAdapters') // For testing staging releases // implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2' // implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:1.13.0-beta2' // implementation 'org.prebid:prebid-mobile-sdk-mopub-adapters:1.13.0-beta2' +// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:1.13.0-beta2' // Standard libraries implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/Example/PrebidInternalTestApp/build.gradle b/Example/PrebidInternalTestApp/build.gradle index 8ba5d578c..988d81855 100644 --- a/Example/PrebidInternalTestApp/build.gradle +++ b/Example/PrebidInternalTestApp/build.gradle @@ -83,11 +83,13 @@ dependencies { implementation project(':PrebidMobile') implementation project(':PrebidMobile-gamEventHandlers') implementation project(':PrebidMobile-mopubAdapters') + implementation project(':PrebidMobile-admobAdapters') // For testing staging releases // implementation 'org.prebid:prebid-mobile-sdk:1.13.0-beta2' // implementation 'org.prebid:prebid-mobile-sdk-gam-event-handlers:1.13.0-beta2' // implementation 'org.prebid:prebid-mobile-sdk-mopub-adapters:1.13.0-beta2' +// implementation 'org.prebid:prebid-mobile-sdk-admob-adapters:1.13.0-beta2' // Base dependencies implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" diff --git a/Example/PrebidInternalTestApp/src/main/res/values/arrays.xml b/Example/PrebidInternalTestApp/src/main/res/values/arrays.xml index a2aaa9bb3..8db9b2e0a 100644 --- a/Example/PrebidInternalTestApp/src/main/res/values/arrays.xml +++ b/Example/PrebidInternalTestApp/src/main/res/values/arrays.xml @@ -29,6 +29,7 @@ @string/segment_title_in_app @string/segment_title_mopub @string/segment_title_gam + @string/segment_title_admob @string/segment_title_all @@ -40,5 +41,6 @@ All MoPub GAM + AdMob In-App \ No newline at end of file diff --git a/PrebidMobile/PrebidMobile-admobAdapters/build.gradle b/PrebidMobile/PrebidMobile-admobAdapters/build.gradle new file mode 100644 index 000000000..da114e6d1 --- /dev/null +++ b/PrebidMobile/PrebidMobile-admobAdapters/build.gradle @@ -0,0 +1,23 @@ +apply from: '../shared-rendering.gradle' +apply from: 'publish-adapters.gradle' + +android { + buildTypes { + release { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + debug { + minifyEnabled false + } + } + defaultConfig { + consumerProguardFiles file('proguard-rules.pro') + } +} + +dependencies { + implementation project(":PrebidMobile") + + implementation 'com.google.android.gms:play-services-ads:20.4.0' +} diff --git a/PrebidMobile/PrebidMobile-admobAdapters/proguard-rules.pro b/PrebidMobile/PrebidMobile-admobAdapters/proguard-rules.pro new file mode 100644 index 000000000..e69de29bb diff --git a/PrebidMobile/PrebidMobile-admobAdapters/publish-adapters.gradle b/PrebidMobile/PrebidMobile-admobAdapters/publish-adapters.gradle new file mode 100644 index 000000000..9a4d5afc0 --- /dev/null +++ b/PrebidMobile/PrebidMobile-admobAdapters/publish-adapters.gradle @@ -0,0 +1,23 @@ +apply plugin: 'maven-publish' + +def ARTIFACT_ID = "prebid-mobile-sdk-admob-adapters" + +publishing { + publications { + eventHandler(MavenPublication) { + artifactId "$ARTIFACT_ID" + artifact "${project.buildDir}/outputs/aar/${project.name}-release.aar" + version "$prebidVersionName" + groupId "$artifactGroupId" + } + } + + // Using local repository for generated artifacts. + repositories { + maven { + name = 'LocalArtifacts' + url = "file://$artifactFolder" + } + } +} + diff --git a/PrebidMobile/PrebidMobile-admobAdapters/src/main/AndroidManifest.xml b/PrebidMobile/PrebidMobile-admobAdapters/src/main/AndroidManifest.xml new file mode 100644 index 000000000..1b8d102bc --- /dev/null +++ b/PrebidMobile/PrebidMobile-admobAdapters/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/scripts/Maven/PrebidMobile-admobAdapters-pom.xml b/scripts/Maven/PrebidMobile-admobAdapters-pom.xml new file mode 100644 index 000000000..9daecd34e --- /dev/null +++ b/scripts/Maven/PrebidMobile-admobAdapters-pom.xml @@ -0,0 +1,65 @@ + + + 4.0.0 + org.prebid + prebid-mobile-sdk-admob-adapters + 1.13.0-beta2 + + jar + Prebid Mobile Android SDK + Prebid Mobile + https://www.prebid.org + + + scm:git:git@github.com:prebid/prebid-mobile-android.git + scm:git:git@github.com:prebid/prebid-mobile-android.git + git@github.com:prebid/prebid-mobile-android.git + + + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + Postindustria AdTech Team + hello@postindustria.com + Postindustria LTD + https://postindustria.com/ + + + + AppNexus Mobile Team + sdk@appnexus.com + AppNexus, Inc. + http://www.appnexus.com + + + + RubiconProject Mobile Team + sdk@https://rubiconproject.com/ + The Rubicon Project, Inc. + https://rubiconproject.com + + + + + + org.prebid + prebid-mobile-sdk + 1.13.0-beta2 + compile + + + com.google.android.gms + play-services-ads + 20.4.0 + compile + + + diff --git a/scripts/Maven/deployPrebidMobile.sh b/scripts/Maven/deployPrebidMobile.sh index 0082eb458..9c0307fab 100755 --- a/scripts/Maven/deployPrebidMobile.sh +++ b/scripts/Maven/deployPrebidMobile.sh @@ -40,8 +40,8 @@ sh ./buildPrebidMobile.sh cp -r ../generated/* "$DEPLOY_DIR_ABSOLUTE" || true -modules=("PrebidMobile" "PrebidMobile-core" "PrebidMobile-rendering" "PrebidMobile-gamEventHandlers" "PrebidMobile-mopubAdapters") -extensions=("jar" "jar" "aar" "jar" "jar") +modules=("PrebidMobile" "PrebidMobile-core" "PrebidMobile-rendering" "PrebidMobile-gamEventHandlers" "PrebidMobile-mopubAdapters" "PrebidMobile-admobAdapters") +extensions=("jar" "jar" "aar" "jar" "jar" "jar") for n in ${!modules[@]}; do echo -e "\n" echoX "Deploying ${modules[$n]} on Maven..." diff --git a/scripts/buildPrebidMobile.sh b/scripts/buildPrebidMobile.sh index 5e07e8ac9..c5aa6bb7c 100755 --- a/scripts/buildPrebidMobile.sh +++ b/scripts/buildPrebidMobile.sh @@ -81,6 +81,7 @@ modules=( "PrebidMobile-rendering" "PrebidMobile-gamEventHandlers" "PrebidMobile-mopubAdapters" + "PrebidMobile-admobAdapters" ) projectPaths=( "$BASEDIR/PrebidMobile" @@ -88,6 +89,7 @@ projectPaths=( "$BASEDIR/PrebidMobile/PrebidMobile-rendering" "$BASEDIR/PrebidMobile/PrebidMobile-gamEventHandlers" "$BASEDIR/PrebidMobile/PrebidMobile-mopubAdapters" + "$BASEDIR/PrebidMobile/PrebidMobile-admobAdapters" ) mkdir "$OUTDIR/aar" diff --git a/scripts/testPrebidMobile.sh b/scripts/testPrebidMobile.sh index 8aaecfd04..cbcf39457 100755 --- a/scripts/testPrebidMobile.sh +++ b/scripts/testPrebidMobile.sh @@ -21,4 +21,5 @@ echoX "start unit tests" ./gradlew PrebidMobile:testDebugUnitTest ./gradlew PrebidMobile-rendering:testDebugUnitTest ./gradlew PrebidMobile-gamEventHandlers:testDebugUnitTest -./gradlew PrebidMobile-mopubAdapters:testDebugUnitTest \ No newline at end of file +./gradlew PrebidMobile-mopubAdapters:testDebugUnitTest +./gradlew PrebidMobile-admobAdapters:testDebugUnitTest \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 71f59caf6..9d9abc405 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,26 +1,26 @@ include ':PrebidMobile', ':PrebidMobile-core', + ':PrebidMobile-rendering', ':PrebidMobile-gamEventHandlers', ':PrebidMobile-mopubAdapters', + ':PrebidMobile-admobAdapters', ':omsdk-android', - ':PrebidMobile-rendering', - -//Prebid Demo apps + // Prebid Demo apps ':PrebidDemoJava', ':PrebidDemoKotlin', ':PrebidInternalTestApp', - -//tools + // Other ':DrPrebid', ':TestUtils' project(':PrebidMobile').projectDir = new File('PrebidMobile') project(':PrebidMobile-core').projectDir = new File('PrebidMobile/PrebidMobile-core') +project(':PrebidMobile-rendering').projectDir = new File('PrebidMobile/PrebidMobile-rendering') project(':PrebidMobile-gamEventHandlers').projectDir = new File('PrebidMobile/PrebidMobile-gamEventHandlers') project(':PrebidMobile-mopubAdapters').projectDir = new File('PrebidMobile/PrebidMobile-mopubAdapters') +project(':PrebidMobile-admobAdapters').projectDir = new File('PrebidMobile/PrebidMobile-admobAdapters') project(':omsdk-android').projectDir = new File('PrebidMobile/omsdk-android') -project(':PrebidMobile-rendering').projectDir = new File('PrebidMobile/PrebidMobile-rendering') project(':PrebidDemoJava').projectDir = new File('Example/PrebidDemoJava') project(':PrebidDemoKotlin').projectDir = new File('Example/PrebidDemoKotlin')