Fix protobuf-rpc publication

Author: rdegnan

build.gradle

@@ -23,47 +23,49 @@ project(':admin-client') {
     description = 'Netifi Proteus Admin Client'
     ext.artifactName = 'admin-client'
 
-    apply from: file('../gradle/java.gradle')
     apply from: file('../gradle/release.gradle')
+    apply from: file('../gradle/java.gradle')
 }
 
 project(':auth') {
     description = 'Netifi Proteus Authentication Utilities'
     ext.artifactName = 'auth'
 
-    apply from: file('../gradle/java.gradle')
     apply from: file('../gradle/release.gradle')
+    apply from: file('../gradle/java.gradle')
 }
 
 project(':client') {
 
     description = 'Netifi Proteus Client'
     ext.artifactName = 'client'
 
-    apply from: file('../gradle/java.gradle')
     apply from: file('../gradle/release.gradle')
+    apply from: file('../gradle/java.gradle')
 }
 
 project(':core') {
     description = 'Netifi Core Library'
     ext.artifactName = 'core'
 
-    apply from: file('../gradle/java.gradle')
     apply from: file('../gradle/release.gradle')
+    apply from: file('../gradle/java.gradle')
 }
 
 project(':frames') {
 
     description = 'Netifi Proteus Frames'
     ext.artifactName = 'frames'
 
-    apply from: file('../gradle/java.gradle')
     apply from: file('../gradle/release.gradle')
+    apply from: file('../gradle/java.gradle')
 }
 
 project(':protobuf-rpc') {
     description = 'Netifi Proteus RPC'
     ext.artifactName = 'protobuf-rpc'
+
+    apply from: file('../gradle/release.gradle')
 }
 
 subprojects {

client/build.gradle

@@ -9,8 +9,8 @@ dependencies {
     compile 'com.typesafe:config:1.3.2'
 }
 
-String protocPluginBaseName = "proteus-java-${osdetector.os}-${osdetector.arch}"
-String javaPluginPath = "$rootDir/protobuf-rpc/build/exe/java_plugin/$protocPluginBaseName"
+def protocPluginBaseName = "proteus-java-${osdetector.os}-${osdetector.arch}"
+def javaPluginPath = "$rootDir/protobuf-rpc/build/exe/java_plugin/$protocPluginBaseName"
 
 protobuf {
     generatedFilesBaseDir = "${projectDir}/src/generated"

gradle/java.gradle

@@ -26,6 +26,23 @@ artifacts {
     archives sourcesJar, javadocJar
 }
 
+jar {
+    baseName = "${artifactName}"
+    version = "${project.version}"
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+
+            artifactId "${artifactName}"
+            artifact sourcesJar
+            artifact javadocJar
+        }
+    }
+}
+
 dependencies {
     testCompile "junit:junit:4.12"
 

gradle/release.gradle

@@ -24,23 +24,6 @@ task versionArchives {
 }
 build.dependsOn versionArchives
 
-jar {
-    baseName = "${artifactName}"
-    version = "${project.version}"
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-
-            artifactId "${artifactName}"
-            artifact sourcesJar
-            artifact javadocJar
-        }
-    }
-}
-
 bintray {
     user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')

protobuf-rpc/build.gradle

@@ -1,13 +1,10 @@
 plugins {
     id 'com.google.protobuf' version '0.8.3'
     id 'cpp'
-    id 'maven'
-    id 'maven-publish'
-    id 'com.jfrog.bintray'
 }
 
-String proteusPrefix = "proteus-java-${osdetector.os}-${osdetector.arch}"
-String proteusName = "${proteusPrefix}.exe"
+def proteusPrefix = "proteus-java-${osdetector.os}-${osdetector.arch}"
+def proteusName = "${proteusPrefix}.exe"
 def artifactStagingPath = "$buildDir/artifacts" as File
 def pathToPlugin = "${artifactStagingPath.getPath()}/${proteusName}"
 
@@ -26,7 +23,7 @@ protobuf {
     }
     plugins {
         proteus {
-            path = "$pathToPlugin"
+            path = pathToPlugin
         }
     }
     generateProtoTasks {
@@ -35,9 +32,7 @@ protobuf {
             task.inputs.file "$pathToPlugin"
             task.inputs.file "${rootProject.projectDir}/build.gradle"
             task.plugins {
-                proteus {
-                    option 'noversion'
-                }
+                proteus {}
             }
         }
     }
@@ -180,39 +175,14 @@ publishing {
     publications {
         maven(MavenPublication) {
             artifactId "${project.ext.artifactName}"
-            artifact("$pathToPlugin") {
+            artifact(pathToPlugin) {
                 classifier osdetector.os + "-" + osdetector.arch
                 builtBy buildArtifacts
             }
         }
     }
 }
 
-bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')
-    publications = ['maven']
-
-    override = true
-
-    pkg {
-        repo = 'netifi-oss'
-        name = "${project.ext.artifactName}"
-        userOrg = 'netifi'
-        desc = "${project.description}"
-        websiteUrl = 'https://github.com/netifi-proteus/proteus-java'
-        issueTrackerUrl = 'https://github.com/netifi-proteus/proteus-java/issues'
-        vcsUrl = 'https://github.com/netifi-proteus/proteus-java.git'
-        licenses = ['Apache-2.0']
-        githubRepo = 'netifi-proteus/proteus-java'
-        githubReleaseNotesFile = 'CHANGELOG.md'
-
-        version {
-            name = "$version"
-        }
-    }
-}
-
 idea {
     module {
         testSourceDirs += file("src/test/proto")