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

[Merge after Monorepo merge] Separate local and remote/candidate implementations #68

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
Note the first digit of every adapter version corresponds to the major version of the Chartboost Mediation SDK compatible with that adapter.
Adapters are compatible with any Chartboost Mediation SDK version within that major version.

### 5.9.7.0.0
- This version of the adapter has been certified with Chartboost SDK 9.7.0.
- This version of the adapter supports Chartboost Mediation SDK version 5.+.

### 4.9.7.0.1
- Runs setUp() on IO context to reduce possibility of ANR terminations.

### 4.9.7.0.0
- This version of the adapter has been certified with Chartboost SDK 9.7.0.

### 4.9.6.1.1
- Fix memory leaks that could occur when fullscreen ads are shown from an `Activity`.

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Follow these guides to create a detailed and effective report for us to understa
* **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened.

### Pull Requests
In order to submit pull requests, you are required to review and sign the [Contribution License Agreement (CLA)](https://developers.chartboost.com/docs/mediation-contribution-license-agreement) which is available on the Chartboost website to view. Once you have read the agreement, sign the appropriate form depending on whether you are an individual an employer contributor.
In order to submit pull requests, you are required to review and sign the [Contribution License Agreement (CLA)](https://docs.chartboost.com/en/partners/contribution-license-agreement/) which is available on the Chartboost website to view. Once you have read the agreement, sign the appropriate form depending on whether you are an individual an employer contributor.

- [Individual contributor license agreement form](https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=159c66e8-610c-4afc-9330-15bc2217c291&env=na3&acct=9c982e12-8675-45df-9d81-95fe3656e695&v=2).
_You wish to contribute on your own behalf as an individual._
Expand All @@ -43,7 +43,7 @@ _You wish to contribute on behalf of your employer._
#### Submitting a Pull Request
Follow these steps to have your contribution considered by the maintainers:

1. Review and sign the [Contribution License Agreement (CLA)](https://developers.chartboost.com/docs/mediation-contribution-license-agreement).
1. Review and sign the [Contribution License Agreement (CLA)](https://docs.chartboost.com/en/partners/contribution-license-agreement/).
2. Identify the issue related to your fix. If an issue doesn't exist, then create a new issue.
3. Create a pull request.
4. Format the title starting with the issue number, followed by a brief description of the fox. _Example: `[ISSUE-60] Fix null pointer exception`._
Expand Down
41 changes: 30 additions & 11 deletions ChartboostAdapter/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 @@ -18,25 +18,32 @@ 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-ads/")
maven("https://cboost.jfrog.io/artifactory/chartboost-core/")
maven("https://cboost.jfrog.io/artifactory/chartboost-mediation/")
maven("https://cboost.jfrog.io/artifactory/chartboost-ads/")
}

android {
namespace = "com.chartboost.mediation.chartboostadapter"
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.9.6.1.1"
android.defaultConfig.versionName = System.getenv("VERSION_OVERRIDE") ?: "5.9.7.0.0"
buildConfigField("String", "CHARTBOOST_MEDIATION_CHARTBOOST_ADAPTER_VERSION", "\"${android.defaultConfig.versionName}\"")

consumerProguardFiles("proguard-rules.pro")
Expand All @@ -48,6 +55,7 @@ android {
productFlavors {
create("local")
create("remote")
create("candidate")
}

buildTypes {
Expand All @@ -62,19 +70,30 @@ 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"))
"localImplementation"(project(":ChartboostMonetization"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this breaks public builds though...
maybe we do this for now for the release then fix it later


// For external usage, please use the following production dependency.
// For external usage, please use the following production dependencies.
// 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")
"remoteImplementation"("com.chartboost:chartboost-sdk:9.7.0")

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

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