resolving conflicts from 12.2.0 release

ChartBoost · Mar 25, 2024 · 0108abc · 0108abc
2 parents b7015e2 + 492ba18
commit 0108abc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/AppLovinAdapter/build.gradle.kts b/AppLovinAdapter/build.gradle.kts
@@ -36,6 +36,7 @@ android {
         targetSdk = 33
         // If you touch the following line, don't forget to update scripts/get_rc_version.zsh
         android.defaultConfig.versionName = System.getenv("VERSION_OVERRIDE") ?: "4.12.3.0.0"
+
         buildConfigField("String", "CHARTBOOST_MEDIATION_APPLOVIN_ADAPTER_VERSION", "\"${android.defaultConfig.versionName}\"")
 
         consumerProguardFiles("proguard-rules.pro")
@@ -72,7 +73,11 @@ dependencies {
     "remoteImplementation"("com.chartboost:chartboost-mediation-sdk:4.0.0")
 
     // Partner SDK
+<<<<<<< HEAD
     implementation("com.applovin:applovin-sdk:12.3.0")
+=======
+    implementation("com.applovin:applovin-sdk:12.2.0")
+>>>>>>> 492ba18b830e4b397a7e4a233862c871d3b41883
 
     // Partner SDK Dependencies
     implementation("androidx.appcompat:appcompat:1.5.1")

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ Adapters are compatible with any Chartboost Mediation SDK version within that ma
 ### 4.12.3.0.0
 - This version of the adapter has been certified with AppLovin SDK 12.3.0.
 
+### 4.12.2.0.0
+- This version of the adapter has been certified with AppLovin SDK 12.2.0.
+
 ### 4.12.1.0.1
 - This version of the adapter has been certified with AppLovin SDK 12.1.0 and performs initialization on `IO` to help reduce potential ANR issues.
 

diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ The Chartboost Mediation AppLovin adapter mediates AppLovin via the Chartboost M
 In your `build.gradle`, add the following entry:
 ```
     implementation "com.chartboost:chartboost-mediation-adapter-applovin:4.12.3.0.0"
+
 ```
 
 ## Contributions
-Original file line number
+Diff line change
@@ Expand Up @@
     In your `build.gradle`, add the following entry:
     ```
         implementation "com.chartboost:chartboost-mediation-adapter-applovin:4.12.3.0.0"
     ```
     ## Contributions
@@ Expand Down @@