Merge branch 'master' into develop

Author: Zelle97

.nb-gradle-properties

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<gradle-project-properties>
+  <!--DO NOT EDIT THIS FILE! - Used by the Gradle plugin of NetBeans.-->
+</gradle-project-properties>

.nb-gradle/private/cache/airtable.java-d41d8cd98f00b204e9800998ecf8427e

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<gradle-project-properties>
+  <!--DO NOT EDIT THIS FILE! - Used by the Gradle plugin of NetBeans.-->
+  <auxiliary>
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+      <group>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/build.gradle</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/test/java/com/sybit/airtable/CustomObjectMapperTest.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/vo/Thumbnail.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/itest/java/com/sybit/airtable/TableSelectTest.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/.travis.yml</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/Airtable.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/vo/Attachment.java</file>
+      </group>
+    </open-files>
+    <editor-bookmarks lastBookmarkId="0" xmlns="http://www.netbeans.org/ns/editor-bookmarks/2"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+      <group>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/.gitignore</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/vo/Thumbnail.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/itest/java/com/sybit/airtable/TableSelectTest.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/test/java/com/sybit/airtable/AirtableTest.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/Airtable.java</file>
+        <file>file:/D:/Projekte/Sybit/Airtable/airtable.java/src/main/java/com/sybit/airtable/vo/Attachment.java</file>
+      </group>
+    </open-files>
+  </auxiliary>
+</gradle-project-properties>

.nb-gradle/profiles/private/aux-config

@@ -19,7 +19,7 @@ deploy:
     tags: true
 - provider: script
   skip_cleanup: true
-  script: "./gradlew install bintrayUpload"
+  script: "./gradlew -i bintrayUpload"
   on:
     repo: Sybit-Education/airtable.java
     tags: true

.travis.yml

@@ -28,18 +28,23 @@ buildscript {
         jcenter()
    }
 
-    dependencies {
-        classpath 'com.palantir:jacoco-coverage:0.4.0'
-        classpath "com.smokejumperit.gradle.license:Gradle-License-Report:0.0.2"
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-	}
+   dependencies {
+       classpath 'com.palantir:jacoco-coverage:0.4.0'
+       classpath "com.smokejumperit.gradle.license:Gradle-License-Report:0.0.2"
+       classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+   }
 }
 
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'com.palantir.jacoco-coverage'
-apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
+allprojects {
+    repositories {
+        jcenter()
+    }
+    apply plugin: 'java'
+    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
+    apply plugin: 'com.palantir.jacoco-coverage'
+    apply plugin: 'com.jfrog.bintray'
+}
 
 group = 'com.sybit'
 version = getVersionName()
@@ -117,6 +122,7 @@ artifacts {
     archives sourcesJar, javadocJar
 }
 
+//task to send coverage data to Codacy
 task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) {
     main = "com.codacy.CodacyCoverageReporter"
     classpath = configurations.codacy
@@ -140,25 +146,39 @@ task integrationTest(type: Test) {
 
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+
+        MyPublication(MavenPublication) {
+            //we have to change scope from runtime to compile. Especially for Gson-lib.
+            pom.withXml {
+                asNode().dependencies.'*'.findAll() {
+                    it.scope.text() == 'runtime' && project.configurations.compile.allDependencies.find { dep ->
+                        dep.name == it.artifactId.text()
+                    }
+                }.each { it.scope*.value = 'compile' }
+            }
+
             if (plugins.hasPlugin('war')) {
                 from components.web
             } else {
                 from components.java
             }
+            groupId group
+            artifactId rootProject.name
+            version getVersionName()
 
             artifact sourcesJar
             artifact javadocJar
         }
+
     }
 }
 
 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']
-    configurations = ['archives']
+    publications = ['MyPublication']
+    //configurations = ['archives']
 
     dryRun = false //Whether to run this as dry-run, without deploying
     publish = true //If version should be auto published after an upload