Merge pull request #15 from massivedisaster/feature/versioning

Added information to build jar task
massivedisaster · Jun 12, 2017 · 59953b0 · 59953b0
2 parents 8430316 + c72a578
commit 59953b0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
-group 'com.massivedisaster.bintraydeployautomator.BintrayDeployAutomator'
-version '1.0-SNAPSHOT'
+group 'com.massivedisaster.bintraydeployautomator.Automator'
+version '0.0.2'
 
 apply plugin: 'java'
 
@@ -15,3 +15,16 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.0'
     runtime 'org.slf4j:slf4j-simple:1.7.10'
 }
+
+jar {
+    baseName 'BintrayDeployAutomator'
+
+    manifest {
+        attributes 'Main-Class': 'com.massivedisaster.bintraydeployautomator.Automator', 'version-number': version
+    }
+
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+
+}
diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF
diff --git a/...ployautomator/BintrayDeployAutomator.java → ...ter/bintraydeployautomator/Automator.java b/...ployautomator/BintrayDeployAutomator.java → ...ter/bintraydeployautomator/Automator.java
@@ -3,7 +3,6 @@
 import com.massivedisaster.bintraydeployautomator.model.Configuration;
 import com.massivedisaster.bintraydeployautomator.utils.FileUtils;
 import com.massivedisaster.bintraydeployautomator.utils.GradleUtils;
-
 import org.gradle.tooling.GradleConnector;
 import org.gradle.tooling.ProjectConnection;
 
@@ -12,7 +11,7 @@
 /**
  * Bintray deploy automator.
  */
-public class BintrayDeployAutomator extends FileUtils {
+public class Automator extends FileUtils {
 
     /**
      * Main method.
@@ -40,7 +39,7 @@ public static void main(String args[]) {
             }
 
         } catch (Exception e) {
-            System.out.println("BintrayDeployAutomator Error: " + e.toString());
+            System.out.println("Automator Error: " + e.toString());
         } finally {
             if (gradleConnection != null) {
                 gradleConnection.close();

diff --git a/src/main/java/com/massivedisaster/bintraydeployautomator/annotations/NotNull.java b/src/main/java/com/massivedisaster/bintraydeployautomator/annotations/NotNull.java
@@ -0,0 +1,9 @@
+package com.massivedisaster.bintraydeployautomator.annotations;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.CLASS)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.LOCAL_VARIABLE})
+public @interface NotNull {
+}
diff --git a/src/main/java/com/massivedisaster/bintraydeployautomator/utils/FileUtils.java b/src/main/java/com/massivedisaster/bintraydeployautomator/utils/FileUtils.java
@@ -1,6 +1,6 @@
 package com.massivedisaster.bintraydeployautomator.utils;
 
-import com.sun.istack.internal.NotNull;
+import com.massivedisaster.bintraydeployautomator.annotations.NotNull;
 
 import java.io.IOException;
 import java.io.PrintWriter;

diff --git a/src/main/java/com/massivedisaster/bintraydeployautomator/utils/GradleUtils.java b/src/main/java/com/massivedisaster/bintraydeployautomator/utils/GradleUtils.java
@@ -1,7 +1,7 @@
 package com.massivedisaster.bintraydeployautomator.utils;
 
-import com.sun.istack.internal.NotNull;
 
+import com.massivedisaster.bintraydeployautomator.annotations.NotNull;
 import org.gradle.tooling.ProjectConnection;
 
 /**