Merge pull request #51 from stachu540/dev

merge dev

Author: Damian Staszewski

.circleci/config.yml

@@ -0,0 +1,69 @@
+# Java Gradle CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-java/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/openjdk:8-jdk
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    environment:
+      # Customize the JVM maximum heap limit
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "build.gradle" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run: gradle dependencies
+
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: v1-dependencies-{{ checksum "build.gradle" }}
+
+      # run tests!
+      - run: gradle test
+  deploy:
+    steps:
+      - checkout
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "build.gradle" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+      - run: gradle bintrayUpload
+
+workflows:
+  version: 2
+  build-deploy:
+    jobs:
+      - build
+      - deploy:
+        requires:
+          - build
+        filters:
+          branches:
+            only: master # master branch or the other
+          tags:
+            only: /v[0-9]+(\.[0-9]+)*/ # regex tags
+
+
+

.travis.yml

@@ -25,7 +25,8 @@ ext {
 
 allprojects {
     group = 'com.github.stachu540'
-    version = '2.1.0'
+    version = '2.1.1-SNAPSHOT'
+    description = "Java-Based API Wrapper for Hi-Rez Studios games."
 
     repositories {
         jcenter()
@@ -51,7 +52,28 @@ subprojects {
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
-    ext.subprojectName = (project.name == "HiRezApi") ? "HiRezApi" : "HiRezApi-${project.name}"
+    ext {
+        subprojectName = (project.name == "HiRezApi") ? "HiRezApi" : "HiRezApi-${project.name}"
+        pomConf = {
+            licenses {
+                license {
+                    name "MIT Licence"
+                    url "https://github.com/stachu540/HiRezAPI/blob/master/LICENSE"
+                    distribution "repo"
+                }
+            }
+            developers {
+                developer {
+                    id "stachu540"
+                    name "Damian Staszewski"
+                    email "damian@stachuofficial.pl"
+                }
+            }
+            scm {
+                url "https://github.com/stachu540/HiRezAPI.git"
+            }
+        }
+    }
 
     sourceSets {
         main {
@@ -93,11 +115,18 @@ subprojects {
         publications {
             mainProject(MavenPublication) {
                 from project.components.java
-                groupId group
+                groupId project.group
                 artifactId subprojectName
-                version version
+                version project.version
                 artifact sourcesJar
                 artifact javadocJar
+                pom.withXml {
+                    def root = asNode()
+                    root.appendNode("description", project.description)
+                    root.appendNode("name", "HiRezAPI")
+                    root.appendNode('url', 'https://github.com/stachu540/HiRezAPI')
+                    root.children().last() + pomConf
+                }
             }
         }
     }
@@ -110,7 +139,7 @@ subprojects {
             repo = 'Java'
             name = 'HiRezAPI'
             userOrg = user
-            desc = 'Java-Based API Wrapper for Hi-Rez Studios games.'
+            desc = project.description
             websiteUrl = 'https://github.com/stachu540/HiRezAPI'
             vcsUrl = 'https://github.com/stachu540/HiRezAPI.git'
             issueTrackerUrl = 'https://github.com/stachu540/HiRezAPI/issues'