Merge branch 'master' of https://github.com/prebid/prebid-mobile-android

 into prebid-repo-update,-pubmatic,-schain

* 'master' of https://github.com/prebid/prebid-mobile-android: (63 commits)
  Update release version to 2.0.3 (prebid#490)
  Update exoplayer to version 2.15.1 and replace deprecated code (prebid#482) (prebid#489)
  Geolocation fixes merge (prebid#488)
  Fix NPE in ad response parser vast on get vast url method (prebid#487)
  Add get query params on url request builder (prebid#486)
  Use OMID Partner name and version from TargetingParams (prebid#480)
  Populate Device.Geo.Country property (prebid#477)
  Configure Proguard  (prebid#479)
  Some fixes (prebid#473)
  Update release version to 2.0.1 (prebid#472)
  Update OM SDK to 1.3.34 prebid#464
  Remove optional permissions from SDK prebid#460
  Interstitial video fixes (prebid#469)
  Add switch for cache enabling in Internal test app (prebid#468)
  Consents improvements (prebid#466)
  Smoke tests kotlin demo (prebid#453)
  Add cases for the vertical and landscape video (prebid#461)
  Rendering controls corrections (prebid#459)
  Applovin MAX privacy settings prebid#454 (prebid#457)
  Update test dependencies (prebid#456)
  ...

# Conflicts:
#	PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/PrebidServerAdapter.java
#	PrebidMobile/PrebidMobile-core/src/main/java/org/prebid/mobile/TargetingParams.java

.circleci/config.yml

@@ -0,0 +1,75 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+# For a detailed guide to building and testing on Android, read the docs:
+# https://circleci.com/docs/2.0/language-android/ for more details.
+version: 2.1
+
+# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
+# See: https://circleci.com/docs/2.0/orb-intro/
+orbs:
+  android: circleci/android@1.0.3
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  android-test:
+    executor:
+      name: android/android-machine
+    steps:
+      - checkout
+      - android/start-emulator-and-run-tests:
+          post-emulator-launch-assemble-command: ./gradlew PrebidDemoKotlin:assembleAndroidTest
+          test-command: ./gradlew PrebidDemoKotlin:connectedDebugAndroidTest
+          system-image: system-images;android-30;google_apis;x86
+  # Below is the definition of your job to build and test your app, you can rename and customize it as you want.
+  build:
+    # These next lines define the Android machine image executor.
+    # See: https://circleci.com/docs/2.0/executor-types/
+    parameters:
+      buildCommand:
+        type: string
+    executor:
+      name: android/android-machine
+
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      # Checkout the code as the first step.
+      - checkout
+      - run:
+          command: << parameters.buildCommand >>
+
+  # Below is the definition of your job to build and test your app, you can rename and customize it as you want.
+  test:
+    # These next lines define the Android machine image executor.
+    # See: https://circleci.com/docs/2.0/executor-types/
+    executor:
+      name: android/android-machine
+    # Add steps to the job
+    # See: https://circleci.com/docs/2.0/configuration-reference/#steps
+    steps:
+      # Checkout the code as the first step.
+      - checkout
+      # And finally run the release build
+      - run:
+          name: Test Frameworks
+          command: scripts/testPrebidMobile.sh
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  sample: # This is the name of the workflow, feel free to change it to better match your workflow.
+    # Inside the workflow, you define the jobs you want to run.
+    jobs:
+      - build:
+         name: Build Java Demo 
+         buildCommand: ./gradlew PrebidDemoJava:assembleDebug
+      - build:
+          name: Build Internal Test App
+          buildCommand: ./gradlew PrebidInternalTestApp:assembleDebug
+      - build:
+         name: Build PrebidMobile Frameworks
+         buildCommand: scripts/buildPrebidMobile.sh -nojar
+      - test:
+          name: Run Unit Tests - Prebid Mobile
+      - android-test:
+          name: Run Smoke UI Tests - Demo App Kotlin - Android 11

.gitignore

@@ -58,3 +58,6 @@ captures/
 
 # Keystore files
 *.jks
+
+# Applovin Max Ad Review plugin
+.safedk/

Example/PrebidDemoJava/build.gradle

@@ -5,15 +5,14 @@ android {
     buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
-        applicationId "org.prebid.mobile.prebidjavademo"
+        applicationId "org.prebid.mobile.javademo"
         minSdkVersion rootProject.minSDKVersion
         targetSdkVersion rootProject.targetSDKVersion
         versionCode rootProject.prebidVersionCode
         versionName rootProject.prebidVersionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
-
     }
     flavorDimensions "version"
     productFlavors {
@@ -34,70 +33,28 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
     buildTypes {
-
         debug {
             minifyEnabled false
-
-//            minifyEnabled true
-//            proguardFiles 'proguard-rules.pro'
-
         }
     }
-}
-
-project.gradle.taskGraph.whenReady {
-    connectedSourceCodeDebugAndroidTest {
-        ignoreFailures = true
+    buildFeatures {
+        dataBinding true
     }
 }
 
-//repositories{
-//    maven {
-//        url 'https://oss.sonatype.org/content/repositories/orgprebid-1059'
-//    }
-//}
-
 dependencies {
-
 //    Source code
     implementation project(':PrebidMobile')
 
-//    Maven
-//    implementation 'org.prebid:prebid-mobile-sdk:1.12.1'
-//    implementation 'org.prebid:prebid-mobile-sdk-core:1.12.1'
-
-//    LocalMaven .aar
-//    implementation 'org.prebid:prebid-mobile-sdk:+'
-//    implementation 'org.prebid:prebid-mobile-sdk-core:+'
-
-//    LocalJar .jar
-//    Fat library
-//    implementation files('libs/PrebidMobile.jar')
-//    implementation files('libs/PrebidMobile-core.jar')
-
-//    localJarImplementation fileTree(dir: 'libs', include: ['*.jar'])
+    // For testing staging releases
+//    implementation "org.prebid:prebid-mobile-sdk:$prebidVersionName"
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.gms:play-services-ads:20.0.0'
-    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('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 'com.squareup.okhttp3:mockwebserver:3.2.0'
-    androidTestImplementation 'org.mockito:mockito-android:2.24.0'
+    implementation 'com.google.android.gms:play-services-ads:20.4.0'
+    implementation 'com.google.android.exoplayer:exoplayer:2.13.3'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.13.3'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.13.3'
+    implementation 'com.google.android.exoplayer:extension-ima:2.13.3'
+    implementation 'androidx.multidex:multidex:2.0.0'
 }