From e46ca4a8bd4e9fb3d6d2936857ffc2e51d4f9006 Mon Sep 17 00:00:00 2001
From: Thomas Mengelatte <thomas.mengelatte@batch.com>
Date: Fri, 6 Dec 2024 16:03:47 +0100
Subject: [PATCH] all: 3.0.0

---
 CHANGELOG.md                             |  5 ++++-
 mixpanel-dispatcher/build.gradle         |  4 ++--
 mixpanel-dispatcher/maven-publish.gradle | 15 ++++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32fead9..c3a047b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
-UPCOMING
+3.0.0
 -----
 
+* Updated Batch to 2.1
+* Batch requires Android min SDK level 21 or higher.
+* Batch requires to compile with SDK 35 (Android 15).
 * Fixed an issue where Batch would crash when a non-hierarchical URI was parsed in a deeplink.
 
 2.0.0
diff --git a/mixpanel-dispatcher/build.gradle b/mixpanel-dispatcher/build.gradle
index 52e2f80..d6864b1 100644
--- a/mixpanel-dispatcher/build.gradle
+++ b/mixpanel-dispatcher/build.gradle
@@ -12,8 +12,8 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        versionCode 2
-        versionName "2.0.0"
+        versionCode 3
+        versionName "3.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
diff --git a/mixpanel-dispatcher/maven-publish.gradle b/mixpanel-dispatcher/maven-publish.gradle
index 4b2ec15..f3a2802 100644
--- a/mixpanel-dispatcher/maven-publish.gradle
+++ b/mixpanel-dispatcher/maven-publish.gradle
@@ -18,23 +18,24 @@ if (signingFile.exists()) {
     }
 }
 
-task androidJavadocs(type: Javadoc) {
+tasks.register('androidJavadocs', Javadoc) {
     source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    android.libraryVariants.all { variant ->
+    classpath += files("${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar")
+    android.libraryVariants.configureEach { variant ->
         if (variant.name == 'release') {
             owner.classpath += variant.getCompileClasspath()
         }
     }
-    exclude '**/R.html', '**/R.*.html', '**/index.html'
+    exclude '**/*.kt', '**/R.html', '**/R.*.html', '**/index.html'
 }
 
-task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+tasks.register('androidJavadocsJar', Jar) {
+    dependsOn androidJavadocs
     archiveClassifier.set("javadoc")
     from androidJavadocs.destinationDir
 }
 
-task androidSourcesJar(type: Jar) {
+tasks.register('androidSourcesJar', Jar) {
     archiveClassifier.set("sources")
     from android.sourceSets.main.java.srcDirs
 }
@@ -144,7 +145,7 @@ signing {
 }
 
 // Do not sign if we run the publishToMavenLocal task, useful for dev
-tasks.withType(Sign) {
+tasks.withType(Sign).configureEach {
     onlyIf {
         !project.gradle.startParameter.taskNames.contains('publishToMavenLocal') &&
                 !project.gradle.startParameter.taskNames.contains('sdk:publishToMavenLocal')