Merge remote-tracking branch 'origin/develop'

build.gradle

@@ -9,7 +9,8 @@ buildscript
 
   dependencies
   {
-    classpath "com.android.tools.build:gradle:2.3.2"
+    classpath "com.android.tools.build:gradle:2.3.3"
+    classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
   }
 }
 
@@ -18,17 +19,6 @@ allprojects
   repositories
   {
     jcenter()
-
-    maven
-    {
-      credentials
-      {
-        username nexusUsername
-        password nexusPassword
-      }
-
-      url nexusRepositoryUrl
-    }
   }
 }
 

httpclient/build.gradle

@@ -1,5 +1,7 @@
 apply plugin: "com.android.library"
+apply plugin: "com.jfrog.bintray"
 apply plugin: "maven"
+apply plugin: "maven-publish"
 
 android
 {
@@ -13,8 +15,8 @@ android
     minSdkVersion 14
     targetSdkVersion 25
 
-    versionCode 2
-    versionName "1.0.0"
+    versionCode 3
+    versionName "1.1.0"
   }
 
   buildTypes
@@ -31,13 +33,13 @@ android
 dependencies
 {
   //Smart&Soft
-  compile ("com.smartnsoft:droid4me:2.4.0")
-  compile ("com.smartnsoft:droid4me.ext:2.4.0")
+  compile files('libs/droid4me-2.4.0.jar')
+  compile files('libs/droid4me.ext-2.4.0.jar')
 
   //Third party libraries
-  compile ("org.apache.httpcomponents:httpcore:4.4")
-  compile ("org.apache.httpcomponents:httpmime:4.5.2")
-  compile ("com.fasterxml.jackson.core:jackson-databind:2.4.1")
+  compile 'org.apache.httpcomponents:httpcore:4.4'
+  compile 'org.apache.httpcomponents:httpmime:4.5.2'
+  compile 'com.fasterxml.jackson.core:jackson-databind:2.4.1'
 }
 
 uploadArchives

httpclient/src/main/java/com/smartnsoft/ws/httpclient/HttpClientWebServiceCaller.java

@@ -1,30 +1,24 @@
-/*
-MIT License
-
-Copyright (c) 2017 Smart&Soft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Contributors:
-  E2M - initial API and implementation
-  Smart&Soft - initial API and implementation
-*/
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 Smart&Soft
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
 
 package com.smartnsoft.ws.httpclient;
 

httpclient/src/main/java/com/smartnsoft/ws/httpclient/JacksonHttpClientWebServiceCaller.java

@@ -1,29 +1,24 @@
-/*
-MIT License
-
-Copyright (c) 2017 Smart&Soft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Contributors:
-  Smart&Soft - initial API and implementation
-*/
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 Smart&Soft
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
 
 package com.smartnsoft.ws.httpclient;
 

httpclient/src/main/java/com/smartnsoft/ws/httpclient/ReuseHttpClient.java

@@ -1,29 +1,24 @@
-/*
-MIT License
-
-Copyright (c) 2017 Smart&Soft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Contributors:
-  Smart&Soft - initial API and implementation
-*/
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 Smart&Soft
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
 
 package com.smartnsoft.ws.httpclient;
 

okhttp/build.gradle

@@ -1,5 +1,7 @@
 apply plugin: "com.android.library"
+apply plugin: "com.jfrog.bintray"
 apply plugin: "maven"
+apply plugin: "maven-publish"
 
 android
 {
@@ -11,8 +13,8 @@ android
     minSdkVersion 14
     targetSdkVersion 25
 
-    versionCode 8
-    versionName "0.8"
+    versionCode 10
+    versionName "1.0"
   }
 
   buildTypes
@@ -29,22 +31,131 @@ android
 dependencies
 {
   //Smart&Soft
-  compile ("com.smartnsoft:droid4me:2.5.1")
-  compile ("com.smartnsoft:droid4me.ext:2.5.1")
+  compile ("com.smartnsoft:droid4me:2.5.2")
+  compile ("com.smartnsoft:droid4me.ext:2.5.2")
 
   //Third party libraries
   compile ("com.squareup.okhttp3:okhttp:3.8.0")
 }
 
+task sourcesJar(type: Jar) {
+  classifier = "sources"
+  from android.sourceSets.main.java.srcDirs
+}
+
+task javadoc(type: Javadoc) {
+  title = "okhttp API"
+  description "Javadoc for the okhttp web service caller implementation"
+  source = android.sourceSets.main.java.srcDirs
+
+  options.charSet = "UTF-8"
+  options.overview = "src/main/javadoc/overview.html"
+  options.links = ["http://docs.oracle.com/javase/7/docs/api/", "http://d.android.com/reference/"]
+
+  classpath += project.files(project.android.getBootClasspath().join(File.pathSeparator))
+  failOnError = false
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+  classifier = "javadoc"
+  from javadoc.destinationDir
+  // options.encoding = 'UTF-8'
+}
+
+artifacts
+{
+  archives javadocJar
+  archives sourcesJar
+}
+
+def pomConfig = {
+  licenses
+  {
+    license
+    {
+      name "MIT License (MIT)"
+      url "https://opensource.org/licenses/MIT"
+      distribution "repo"
+    }
+  }
+}
+
+publishing
+{
+  publications
+  {
+    ReleasePublication(MavenPublication)
+    {
+      artifact sourcesJar
+      artifact javadocJar
+      groupId "com.smartnsoft"
+      artifactId "okhttpwebservicecaller"
+      version android.defaultConfig.versionName
+
+      pom.withXml
+      {
+        def root = asNode()
+        root.appendNode("description", "extension of the droid4me framework which contains the okhttp web service caller implementation")
+        root.appendNode("name", "okhttpwebservicecaller")
+        root.appendNode("url", "hhttps://github.com/smartnsoft/droid4me.ws")
+        root.children().last() + pomConfig
+      }
+    }
+  }
+}
+
+//https://gist.github.com/bugs84/b7887fb5d7f9f2d484b8
+publishing.publications.all
+{
+  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"
+    }
+  }
+}
+
+bintray
+{
+  user = bintrayUsername
+  key = bintrayKey
+
+  publications = ["ReleasePublication"]
+
+  pkg
+  {
+    repo = "maven"
+    name = "okhttpwebservicecaller"
+    userOrg = "smartnsoft"
+    licenses = ["MIT"]
+    vcsUrl = "https://github.com/smartnsoft/droid4me.ws.git"
+    publish = true
+
+    version
+    {
+      name = android.defaultConfig.versionName
+      desc = "extension of the droid4me framework which contains the okhttp web service caller implementation"
+      released  = new Date()
+      vcsTag = "okhttpwebservicecaller-" + android.defaultConfig.versionName
+    }
+  }
+}
+
 uploadArchives
 {
   repositories
   {
     mavenDeployer
     {
-      repository(url: nexusReleaseUrl)
+      repository(url: "https://api.bintray.com/maven/smartnsoft/maven/okhttpwebservicecaller/;publish=1")
       {
-        authentication(userName: nexusUsername, password: nexusPassword)
+        authentication(userName: bintrayUsername, password: bintrayKey)
       }
 
       snapshotRepository(url: nexusSnapshotUrl)
@@ -54,9 +165,9 @@ uploadArchives
 
       pom.project
       {
-        name "okhttpclientwebservicecaller"
+        name "okhttpwebservicecaller"
         groupId "com.smartnsoft"
-        artifactId "okhttpclientwebservicecaller"
+        artifactId "okhttpwebservicecaller"
         version android.defaultConfig.versionName
         packaging "aar"
       }