Fix merge

Author: gthea

build.gradle

@@ -5,32 +5,32 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
+        classpath "com.vanniktech:gradle-maven-publish-plugin:0.33.0"
     }
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
 apply plugin: 'signing'
 apply plugin: 'kotlin-android'
+apply plugin: 'com.vanniktech.maven.publish'
 apply from: 'spec.gradle'
 apply from: 'jacoco.gradle'
 
-
 ext {
     splitVersion = '5.3.0'
     jacocoVersion = '0.8.8'
 }
 
 // Define exclusions for JaCoCo coverage
 def coverageExclusions = [
-    '**/R.class',
-    '**/R$*.class',
-    '**/BuildConfig.*',
-    '**/Manifest*.*',
-    '**/*Test*.*',
-    'android/**/*.*'
+        '**/R.class',
+        '**/R$*.class',
+        '**/BuildConfig.*',
+        '**/Manifest*.*',
+        '**/*Test*.*',
+        'android/**/*.*'
 ]
 
 android {
@@ -76,7 +76,7 @@ android {
 
     testOptions {
         unitTests.returnDefaultValues = true
-        
+
         // Configure JaCoCo for all test tasks
         unitTests.all {
             jacoco {
@@ -114,17 +114,17 @@ android {
     }
 }
 
+repositories {
+    google()
+    mavenCentral()
+}
+
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
         jvmTarget = "1.8"
     }
 }
 
-repositories {
-    google()
-    mavenCentral()
-}
-
 dependencies {
 
     def roomVersion = '2.4.3'
@@ -195,7 +195,6 @@ dependencies {
 
 def splitPOM = {
     name = 'Split Android SDK'
-    packaging = 'aar'
     description = 'Official Split Android SDK'
     url = 'https://github.com/splitio/android-client'
 
@@ -208,15 +207,8 @@ def splitPOM = {
 
     developers {
         developer {
-            id = 'sarrubia'
-            name = 'Sebastian Arrubia'
-            email = 'sebastian@split.io'
-        }
-
-        developer {
-            id = 'fernando'
-            name = 'Fernando Martin'
-            email = 'fernando@split.io'
+            id = 'sdks'
+            email = 'sdks@split.io'
         }
     }
 
@@ -227,59 +219,17 @@ def splitPOM = {
     }
 }
 
-def releaseRepo = {
-    name = "ReleaseRepo"
-    def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-    def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-    url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-    credentials {
-        username = ossrhUsername
-        password = ossrhPassword
-    }
-}
-
-afterEvaluate {
-    android.sourceSets.all { sourceSet ->
-        if (!sourceSet.name.startsWith("test")) {
-            sourceSet.kotlin.setSrcDirs([])
-        }
-    }
-
-    publishing {
-        publications {
-            release(MavenPublication) {
-                from components.release
-
-                artifactId = 'android-client'
-                groupId = 'io.split.client'
-                version = splitVersion
-                artifact sourcesJar
-                artifact javadocJar
-
-                pom splitPOM
-
-                repositories {
-                    maven releaseRepo
-                }
-            }
-        }
-    }
-
-    task publishRelease(type: PublishToMavenRepository) {
-        publication = publishing.publications.getByName("release")
-        repository = publishing.repositories.ReleaseRepo
-    }
+mavenPublishing {
+    coordinates("io.split.client", "android-client", splitVersion)
+    pom(splitPOM)
 
-    signing {
-        sign publishing.publications.getByName("release")
-    }
+    publishToMavenCentral(false)
+    signAllPublications()
 }
 
-
 task sourcesJar(type: Jar) {
     archiveClassifier.set("sources")
     from android.sourceSets.main.java.srcDirs
-//    archiveClassifier = "sources"
 }
 
 task javadoc(type: Javadoc) {
@@ -337,4 +287,3 @@ tasks.withType(Test) {
 
 
 
-

deps.txt

@@ -123,6 +123,6 @@ releaseRuntimeClasspath - Runtime classpath of compilation 'release' (target  (a
 |         \--- com.google.android.gms:play-services-basement:18.1.0 (*)
 \--- androidx.multidex:multidex:2.0.1
 
-(*) - dependencies omitted (listed previously)
+(*) - Indicates repeated occurrences of a transitive dependency subtree. Gradle expands transitive dependency subtrees only once per project; repeat occurrences only display the root of the subtree, followed by this annotation.
 
 A web-based, searchable dependency report is available by adding the --scan option.