Skip to content

Commit

Permalink
5.0.0 Mediation adapter (#81)
Browse files Browse the repository at this point in the history
* [HB-6645] Helium rebranding

* [HB-6442] Refactor show to take Activity instead of Context

* AdapterConfiguration

* Remove unnecessary empty constructor

* [HB-7794] New ChartboostMediation error design (#68)

* New ChartboostMediation error design

* [HB-7794] Remove test exception throwing

* Update CLA links (#69)

* [HB-7637] Partner Adapter Rework (#70)

* Gradle 8 migration (#71)

* Gradle 8 migration

* JDK 17 instead of 11 in build files

* Revert "JDK 17 instead of 11 in build files"

This reverts commit 5526b59.

* Explicitely define JDK 17 in build.gradle.kts

* Revert "Explicitely define JDK 17 in build.gradle.kts"

This reverts commit e0dbc0e.

* Pre 5.0 getting ready for release (#72)

* [HB-7689] Version pumps for Mediation 5 (#73)

* API 34 (#74)

* Initialization of `MobileAds` SDK on the `IO` context for mediation 5 adapter (#76)

* Initialization of `MobileAds` SDK on the `IO` context for mediation 5 adapter.

* Removed the unneeded `return@withContext`

* HB-8087 Privacy Audit (#77)

* Add correct banner size return for 5.0

* Banner Size Update (#80)

* fixing build

* jdk 17

* java 17

* bad rebase

---------

Co-authored-by: vu <[email protected]>
Co-authored-by: Ray Graham <[email protected]>
Co-authored-by: CB-RyanMcCormick <[email protected]>
  • Loading branch information
4 people committed Aug 1, 2024
1 parent 0772a94 commit 6230bb2
Show file tree
Hide file tree
Showing 12 changed files with 316 additions and 269 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: gradle

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: gradle

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: set up JDK 11
- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
cache: gradle

Expand Down
33 changes: 26 additions & 7 deletions AdMobAdapter/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2022-2024 Chartboost, Inc.
*
*
* Use of this source code is governed by an MIT-style
* license that can be found in the LICENSE file.
*/
Expand All @@ -17,24 +17,31 @@ plugins {
repositories {
google()
mavenCentral()
maven("https://cboost.jfrog.io/artifactory/private-chartboost-core/") {
credentials {
username = System.getenv("JFROG_USER")
password = System.getenv("JFROG_PASS")
}
}
maven("https://cboost.jfrog.io/artifactory/private-chartboost-mediation/") {
credentials {
username = System.getenv("JFROG_USER")
password = System.getenv("JFROG_PASS")
}
}
maven("https://cboost.jfrog.io/artifactory/chartboost-core/")
maven("https://cboost.jfrog.io/artifactory/chartboost-mediation/")
}

android {
namespace = "com.chartboost.mediation.admobadapter"
compileSdk = 33
compileSdk = 34

defaultConfig {
minSdk = 21
targetSdk = 33
targetSdk = 34
// If you touch the following line, don't forget to update scripts/get_rc_version.zsh
android.defaultConfig.versionName = System.getenv("VERSION_OVERRIDE") ?: "4.22.3.0.6"
android.defaultConfig.versionName = System.getenv("VERSION_OVERRIDE") ?: "5.23.2.0.0"

buildConfigField(
"String",
Expand All @@ -49,6 +56,7 @@ android {
productFlavors {
create("local")
create("remote")
create("candidate")
}

buildTypes {
Expand All @@ -63,18 +71,29 @@ android {

buildFeatures {
viewBinding = true
buildConfig = true
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
}
}

dependencies {
"localImplementation"(project(":Helium"))
"localImplementation"(project(":ChartboostMediation"))

// For external usage, please use the following production dependency.
// You may choose a different release version.
"remoteImplementation"("com.chartboost:chartboost-mediation-sdk:4.0.0")
"remoteImplementation"("com.chartboost:chartboost-mediation-sdk:5.0.0")
"candidateImplementation"("com.chartboost:chartboost-mediation-sdk:5.0.0")

// Partner SDK
implementation("com.google.android.gms:play-services-ads:22.3.0")
implementation("com.google.android.gms:play-services-ads:23.2.0")

// Adapter Dependencies
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
Expand Down
Loading

0 comments on commit 6230bb2

Please sign in to comment.