Merge branch 'master' into develop

Author: Zelle97

.travis.yml

@@ -1,34 +1,27 @@
 language: java
 jdk:
-  - oraclejdk8
-
+- oraclejdk8
 before_install:
-  - chmod +x ./gradlew
-
+- chmod +x ./gradlew
 script:
-  - ./gradlew check sendCoverageToCodacy
-
+- "./gradlew check sendCoverageToCodacy"
 deploy:
-  - provider: script
-    skip_cleanup: true
-    script: gradlew install bintrayUpload
-    on:
-      tags: true
-      
-  - provider: releases
-    api_key:
-      secure: ltLzm1VWcBj5sLTqtEUQyd3JG5pYZ6nQG5czsWB28hvJ3wkVa6vt7L5j3OS8wZuaIdE6eDJ2rMfQ5qS1FAE91SiQfCsMArsZ5C2cWm7BSz70MAa2zCWgxxlMsvARTnSLaP9mVgbZN0js2p0ETVVuUj+MG1dQJGXhsggmFI3ZSxCnWpoAhtGDVvQr8BZp4w5hPJ0Xm144v9ZnT2oUwmwevlVFzO+QzjiUJwPCjy4y6rJAJDdYdY0mTUQq7Y9SwkjXQACNwDRs6ITQ4nbClCk7RtDIKUFYWvuq9IRD0OhVXibTtMC4yocl+PsM6XvCYCAWPjLon20Pc2fdepzWhYPkyoOf9SDDUFAHEjYQ+vw2BkQpx3WwMZDLJbGXI1z0+evYUhSxr7oRSzoRfpCYFtEJ7toLb8SPTsYkyQQp5N1EDNtnIgBZhsQpFdxDgZ8vrVeWiLVtzX5ARgz0GV/yL2v+2ZzPg7usEJSNC6xwyjGiPGDtggUy2HIsP1ohl56VVvU5RjfoKcXxysbm0L43sddZHIuNggyku7pNlYsgHdrUf/0qanxxrU46w8M4vUdyd1oC/pXwaUkpdjA6nFU+ouoX1ScihxZzlkE2TYEFJqbKcWQ8d9zeYW90pemc8oWZJcylyF0ef2MJKy3DgNplnoSJM6q6sDunAA5wGN5A+vu/Ahw=
-    skip_cleanup: true
-    file_glob: true
-    file: ./build/libs/*
-    on:
-      repo: Sybit-Education/airtable.java
-      tags: true
-
-
+- provider: releases
+  api_key:
+    secure: ltLzm1VWcBj5sLTqtEUQyd3JG5pYZ6nQG5czsWB28hvJ3wkVa6vt7L5j3OS8wZuaIdE6eDJ2rMfQ5qS1FAE91SiQfCsMArsZ5C2cWm7BSz70MAa2zCWgxxlMsvARTnSLaP9mVgbZN0js2p0ETVVuUj+MG1dQJGXhsggmFI3ZSxCnWpoAhtGDVvQr8BZp4w5hPJ0Xm144v9ZnT2oUwmwevlVFzO+QzjiUJwPCjy4y6rJAJDdYdY0mTUQq7Y9SwkjXQACNwDRs6ITQ4nbClCk7RtDIKUFYWvuq9IRD0OhVXibTtMC4yocl+PsM6XvCYCAWPjLon20Pc2fdepzWhYPkyoOf9SDDUFAHEjYQ+vw2BkQpx3WwMZDLJbGXI1z0+evYUhSxr7oRSzoRfpCYFtEJ7toLb8SPTsYkyQQp5N1EDNtnIgBZhsQpFdxDgZ8vrVeWiLVtzX5ARgz0GV/yL2v+2ZzPg7usEJSNC6xwyjGiPGDtggUy2HIsP1ohl56VVvU5RjfoKcXxysbm0L43sddZHIuNggyku7pNlYsgHdrUf/0qanxxrU46w8M4vUdyd1oC/pXwaUkpdjA6nFU+ouoX1ScihxZzlkE2TYEFJqbKcWQ8d9zeYW90pemc8oWZJcylyF0ef2MJKy3DgNplnoSJM6q6sDunAA5wGN5A+vu/Ahw=
+  skip_cleanup: true
+  file_glob: true
+  file: "./build/libs/*"
+  on:
+    repo: Sybit-Education/airtable.java
+    tags: true
+- provider: script
+  skip_cleanup: true
+  script: "./gradlew install bintrayUpload"
+  on:
+    repo: Sybit-Education/airtable.java
+    tags: true
 before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-
+- rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:
- directories:
-  — $HOME/.gradle
+  directories: "— $HOME/.gradle"

build.gradle

@@ -1,3 +1,19 @@
+/*
+ * Gets the version name from the latest Git tag
+ */
+def getVersionName = { ->
+    try {
+        def stdout = new ByteArrayOutputStream()
+        exec {
+            commandLine 'git', 'describe', '--tags'
+            standardOutput = stdout
+        }
+        return stdout.toString().trim()
+    }
+    catch (ignored) {
+        return version;
+    }
+}
 /*
  * The MIT License (MIT)
  * Copyright (c) 2017 Sybit GmbH
@@ -24,7 +40,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 
 group = 'com.sybit'
-version = '0.1'
+version = getVersionName()
 
 description = """com.sybit airtable"""
 
@@ -63,7 +79,6 @@ dependencies {
     codacy group: 'com.codacy', name: 'codacy-coverage-reporter', version: '1.0.13'
 }
 
-
 /*
  * Gets the version name from the latest Git tag
  */
@@ -128,17 +143,21 @@ bintray {
     user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
     key = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
 
-    publications = ['mavenJava']
+    //publications = ['mavenJava']
+    configurations = ['archives']
 
     dryRun = false //Whether to run this as dry-run, without deploying
     publish = true //If version should be auto published after an upload
-    version getVersionName()
+
     pkg {
         repo = 'maven'
         userOrg = 'sybit-education'
         name = 'airtable.java'
         licenses = ['MIT License']
         vcsUrl = 'https://github.com/Sybit-Education/airtable.java.git'
-
+        version {
+            name = getVersionName()
+            released = new Date()
+        }
     }
 }