From 6c2ffe8dd1bceae364d67fd0985c85ec2ecb8bed Mon Sep 17 00:00:00 2001
From: Antony Denyer <git@antonydenyer.co.uk>
Date: Tue, 26 Nov 2019 11:06:30 +0000
Subject: [PATCH] build: use fully qualified artifactId

---
 build.gradle                | 10 ++++++++--
 gradle/bintray/build.gradle |  6 +++---
 gradle/publish/build.gradle |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index df1c1d1..4982aee 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,6 @@ repositories {
     }
 }
 
-ext.scmSlug = 'web3j-aion'
-
 description 'Integrates web3j with the Aion Network blockchain.'
 
 ext {
@@ -70,6 +68,14 @@ subprojects {
         }
     }
 
+    publishing {
+        publications {
+            maven(MavenPublication) {
+                artifactId = "${rootProject.name}-$project.name"
+            }
+        }
+    }
+
     testSets {
         integrationTest {
             dirName = 'integration-test'
diff --git a/gradle/bintray/build.gradle b/gradle/bintray/build.gradle
index 6289638..5984b8c 100644
--- a/gradle/bintray/build.gradle
+++ b/gradle/bintray/build.gradle
@@ -3,9 +3,9 @@ apply plugin: 'com.jfrog.bintray'
 bintray {
     user = System.getenv('BINTRAY_USER')
     key = System.getenv('BINTRAY_KEY')
-    def slug = project.name
-    if(project.hasProperty('scmSlug')) {
-        slug = project.scmSlug
+    def slug = rootProject.name
+    if (project.hasProperty('rootProjectOverride')) {
+        slug = project.rootProjectOverride
     }
     publications = ['maven']
     publish = true
diff --git a/gradle/publish/build.gradle b/gradle/publish/build.gradle
index e54cb70..ed32aee 100644
--- a/gradle/publish/build.gradle
+++ b/gradle/publish/build.gradle
@@ -43,9 +43,9 @@ publishing {
                 }
 
                 scm {
-                    def slug = project.name
-                    if (project.hasProperty('scmSlug')) {
-                        slug = project.scmSlug
+                    def slug = rootProject.name
+                    if (project.hasProperty('rootProjectOverride')) {
+                        slug = project.rootProjectOverride
                     }
 
                     url = "https://github.com/web3j/$slug"