Fixed publication issues

Author: LachlanMcKee

Diff for: build.gradle

@@ -14,7 +14,6 @@ buildscript {
     dependencies {
         classpath deps.build.gradlePlugins.android
         classpath deps.build.gradlePlugins.kotlin
-        classpath deps.build.gradlePlugins.mavenPublish
         classpath deps.build.gradlePlugins.detekt
         classpath deps.build.gradlePlugins.jacoco
     }

Diff for: gradle.properties

@@ -14,18 +14,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 org.gradle.caching=true
 org.gradle.parallel=true
 
-GROUP=com.badoo.ribs
 VERSION_NAME=0.40.2
-POM_DESCRIPTION=Badoo RIBs is an evolution of Uber RIBs, with notable differences and additions
-POM_URL=https://github.com/badoo/RIBs/
-POM_SCM_URL=https://github.com/badoo/RIBs/
-POM_SCM_CONNECTION=scm:git:git://github.com/badoo/RIBs.git
-POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/badoo/RIBs.git
-POM_LICENCE_NAME=The Apache Software License, Version 2.0
-POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
-POM_LICENCE_DIST=repo
-POM_DEVELOPER_ID=badoo
-POM_DEVELOPER_NAME=Badoo Trading Limited
 
 android.useAndroidX=true
 android.defaults.buildfeatures.buildconfig=true

Diff for: gradle/dependencies.gradle

@@ -64,7 +64,6 @@ def build = [
         gradlePlugins   : [
                 android     : agp,
                 kotlin      : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
-                mavenPublish: 'com.vanniktech:gradle-maven-publish-plugin:0.15.1',
                 detekt      : 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.21.0',
                 jacoco      : "org.jacoco:org.jacoco.core:${versions.jacoco}"
         ]

Diff for: gradle/gradle-mvn-push.gradle

@@ -1,6 +1,3 @@
-version = VERSION_NAME
-group = GROUP
-
 def getReleaseRepositoryUrl() {
     return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
             : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
@@ -11,22 +8,58 @@ def getSnapshotRepositoryUrl() {
             : "https://oss.sonatype.org/content/repositories/snapshots/"
 }
 
-apply plugin: "com.vanniktech.maven.publish"
+apply plugin: "maven-publish"
 
-publishing {
-    repositories {
-        maven {
-            url = version.endsWith('SNAPSHOT') ? getSnapshotRepositoryUrl() : getReleaseRepositoryUrl()
+android {
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
         }
     }
 }
 
-mavenPublish {
-    releaseSigningEnabled false
-}
+afterEvaluate {
+    publishing {
+        repositories {
+            maven {
+                url = version.endsWith('SNAPSHOT') ? getSnapshotRepositoryUrl() : getReleaseRepositoryUrl()
+            }
+        }
 
-project.afterEvaluate {
-    project.tasks.named("androidSourcesJar").configure {
-        from project.android.sourceSets.main.java.srcDirs
+        publications {
+            release(MavenPublication) {
+                afterEvaluate {
+                    from components.release
+                }
+                groupId = "com.badoo.ribs"
+                version = VERSION_NAME
+
+                pom {
+                    name.set("MVICore")
+                    description.set("Badoo RIBs is an evolution of Uber RIBs, with notable differences and additions")
+                    url.set("https://github.com/badoo/RIBs/")
+                    licenses {
+                        license {
+                            name.set("The Apache Software License, Version 2.0")
+                            url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+                        }
+                    }
+                    developers {
+                        developer {
+                            id.set("badoo")
+                            name.set("Badoo Trading Limited")
+                            email.set("[email protected]")
+                        }
+                    }
+                    scm {
+                        connection.set("scm:git:git://github.com/badoo/RIBs.git")
+                        developerConnection.set("scm:git:ssh://[email protected]/badoo/RIBs.git")
+                        url.set("https://github.com/badoo/RIBs/")
+                    }
+                }
+            }
+        }
     }
 }
+