Merge pull request #12 from microsoftgraph/bugfix/gradle-upgrade

- replaces gradle upgrade fixes from core

Author: baywet

build.gradle

@@ -13,6 +13,7 @@ plugins {
     id 'eclipse'
     id 'maven-publish'
     id 'signing'
+    id 'com.jfrog.bintray' version '1.8.5'
 }
 
 // In this section you declare where to find the dependencies of your project
@@ -63,11 +64,6 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     archiveClassifier = 'javadoc'
 }
 
-signing {
-	sign configurations.archives
-}
-tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
-
 publishing {
 
     publications {
@@ -112,26 +108,9 @@ publishing {
         	pom.withXml {
         		def pomFile = file("${project.buildDir}/generated-pom.xml")
         		writeTo(pomFile)
-        		def pomAscFile = signing.sign(pomFile).signatureFiles[0]
-        		artifact(pomAscFile) {
-                    classifier = null
-                    extension = 'pom.asc'
-                }
         	}
         	artifact sourceJar
         	artifact javadocJar
-        	project.tasks.signArchives.signatureFiles.each {
-        		artifact(it) {
-        			def matcher = it.file =~ /-(sources|javadoc)\.jar\.asc$/
-        			if(matcher.find()){
-        				classifier = matcher.group(1)
-        			}
-        			else{
-        				classifier = null
-        			}
-        			extension = 'jar.asc'
-				}
-			}
 		}
     }
 	repositories {
@@ -191,7 +170,51 @@ publishing {
             }
 		}
     }
+}
+
+signing {
+    sign publishing.publications.mavenCentralRelease
+}
+tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
 
+def fixAscNames = { name -> 
+    if(name.contains('pom')) {
+        "${project.property('mavenArtifactId')}-${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}.pom.asc"
+    } else {
+        name.replace('msgraph-beta-sdk-java', "${project.property('mavenArtifactId')}-${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}")
+    }
+}
+bintray {
+    if (project.rootProject.file('local.properties').exists()) {
+        Properties properties = new Properties()
+        properties.load(project.rootProject.file('local.properties').newDataInputStream())
+        user = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
+        key = properties.getProperty('bintray.apikey')
+    }
+	publications = ['mavenCentralRelease']
+    filesSpec {
+        from ('build/libs') {
+            include 'msgraph-beta-sdk-java*.jar.asc'
+            rename fixAscNames
+        }
+        from ('build') {
+            include 'generated-pom.xml.asc'
+            rename fixAscNames
+        }
+        into "com/microsoft/graph/${project.property('mavenArtifactId')}/${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}/"
+    }
+	pkg {
+		repo = 'Maven'
+		name = project.property('mavenArtifactId')
+		userOrg = 'microsoftgraph'
+		licenses = ['MIT']
+		vcsUrl = 'https://github.com/microsoftgraph/msgraph-beta-sdk-java.git'
+		publicDownloadNumbers = true
+		version {
+			name = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
+			vcsTag = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
+		}
+	}
 }
 
 compileJava {
@@ -269,7 +292,7 @@ gradle.taskGraph.whenReady { taskGraph ->
 
 model {
     tasks.generatePomFileForMavenCentralReleasePublication {
-        destination = file("$buildDir/generated-pom.xml")
+        destination = file("${project.buildDir}/generated-pom.xml")
     }
     tasks.publishMavenCentralReleasePublicationToMavenLocal {
         dependsOn project.tasks.signArchives