Skip to content

Commit

Permalink
Merge pull request #678 in MOBILE-SDK/app_mobile-sdk-android from rel…
Browse files Browse the repository at this point in the history
…ease_branch_8.3 to master

* commit 'f8e460ace1c38aef2b6eab6cca042dbe64eb8765':
  release sdk version 8.3
  MS-5210 update AdMob to latest version (21.3.0) to develop
  added mobile vast player
  updated sdk
  android new omid libs
  • Loading branch information
Ritesh Zaveri committed Dec 20, 2022
2 parents 3b59232 + f8e460a commit 4fa708b
Show file tree
Hide file tree
Showing 13 changed files with 262 additions and 226 deletions.
8 changes: 8 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 8.3.0

### Improvement/Bug Fixes
+ MS-5208, MS-5215 Upgraded OMSDK from 1.3.31 to 1.4.2

### Mediation partner updates
+ MS-5210 Upgraded Google AdMob SDK from 20.6.0 to 21.3.0

## 8.2

### Improvement/Bug Fixes
Expand Down
4 changes: 2 additions & 2 deletions instreamvideo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Project Properties
version = "1.40" // Instream SDK version
version = "1.41" // Instream SDK version

apply plugin: 'com.android.library'

Expand All @@ -10,7 +10,7 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 32
versionCode 39 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
versionCode 40 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
versionName version
consumerProguardFiles 'proguard-project.txt'
}
Expand Down
4 changes: 2 additions & 2 deletions mediation/mediatedviews/GooglePlay/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Project Properties
version = "20.6.0" // supported Google version
version = "21.3.0" // supported Google version

apply plugin: 'com.android.library'

Expand All @@ -8,7 +8,7 @@ android {
buildToolsVersion '32.0.0'

defaultConfig {
minSdkVersion 16
minSdkVersion 19
targetSdkVersion 32
versionCode 1
versionName version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,6 @@ private AdManagerAdRequest buildRequest(DFBBannerSSParameters ssparm, TargetingP
if (!StringUtil.isEmpty(targetingParameters.getAge())) {
bundle.putString("Age", targetingParameters.getAge());
}
if (targetingParameters.getLocation() != null) {
builder.setLocation(targetingParameters.getLocation());
}
for (Pair<String, String> p : targetingParameters.getCustomKeywords()) {
if (p.first.equals("content_url")) {
if (!StringUtil.isEmpty(p.second)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@ private AdManagerAdRequest buildRequest(TargetingParameters targetingParameters)
if (!StringUtil.isEmpty(targetingParameters.getAge())) {
bundle.putString("Age", targetingParameters.getAge());
}
if (targetingParameters.getLocation() != null) {
builder.setLocation(targetingParameters.getLocation());
}
for (Pair<String, String> p : targetingParameters.getCustomKeywords()) {
if (p.first.equals("content_url")) {
if (!StringUtil.isEmpty(p.second)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ public static AdRequest buildRequest(TargetingParameters targetingParameters) {
AdRequest.Builder builder = new AdRequest.Builder();

if (targetingParameters != null) {
if (targetingParameters.getLocation() != null) {
builder.setLocation(targetingParameters.getLocation());
}
Bundle bundle = new Bundle();

if (!StringUtil.isEmpty(targetingParameters.getAge())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ private AdRequest buildRequest(TargetingParameters targetingParameters) {
if (!StringUtil.isEmpty(targetingParameters.getAge())) {
bundle.putString("Age", targetingParameters.getAge());
}
if (targetingParameters.getLocation() != null) {
builder.setLocation(targetingParameters.getLocation());
}
for (Pair<String, String> p : targetingParameters.getCustomKeywords()) {
if (p.first.equals("content_url")) {
if (!StringUtil.isEmpty(p.second)) {
Expand Down
155 changes: 88 additions & 67 deletions sdk/assets/OMLICENSE

Large diffs are not rendered by default.

141 changes: 70 additions & 71 deletions sdk/assets/apn_omsdk.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions sdk/assets/mobilevastplayer.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions sdk/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Project properties
version = "8.2"
version = "8.3"
group='com.appnexus.opensdk'

// Android build
Expand All @@ -9,7 +9,7 @@ android {
compileSdkVersion 32
buildToolsVersion '32.0.0'
defaultConfig {
versionCode 98 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
versionCode 99 // An integer value that represents the version of the code, relative to other versions. Increase for each release.
versionName version
consumerProguardFiles 'proguard-project.txt'
minSdkVersion 14
Expand Down
154 changes: 87 additions & 67 deletions sdk/libs/OMLICENSE

Large diffs are not rendered by default.

Binary file modified sdk/libs/omsdk.jar
Binary file not shown.

0 comments on commit 4fa708b

Please sign in to comment.