Merging with 2.3 release

Author: tomkoptel

NOTICES.txt

@@ -25,9 +25,19 @@ along with Jaspersoft Mobile SDK for Android. If not, see
 THIRD PARTY COMPONENTS
 -------------------------------
 This software includes third party software subject to the associated copyrights, as follows:
-- Simple XML 2.7 (Apache 2.0) - http://simple.sourceforge.net/
-- Spring Android 1.0.1 (Apache 2.0) - http://www.springsource.org/spring-android
-- RoboSpice 1.4.11 (Apache 2.0) - https://github.com/octo-online/robospice
+* Software for developing case
+- Intellij Annotations 12.0 (Apache 2.0) - http://mvnrepository.com/artifact/com.intellij/annotations/12.0
+- Retrofit 2.0.0-beta1 (Apache 2.0) - https://github.com/square/retrofit/blob/master/LICENSE.txt
+- Rxjava 1.1.0 (Apache 2.0) - https://raw.githubusercontent.com/ReactiveX/RxJava/1.x/LICENSE
+
+* Software for testing case
+- Equalsverifier 1.7.5 (Apache 2.0) - https://github.com/jqno/equalsverifier/blob/master/LICENSE.md
+- JUnitParams 1.0.4 (Apache 2.0) - https://github.com/Pragmatists/JUnitParams/blob/master/LICENSE.txt
+- Hamcrest Integration 1.3 (New BSD 3) - http://opensource.org/licenses/BSD-3-Clause
+- Powermock 1.6.2 (Apache 2.0) - https://github.com/jayway/powermock/blob/master/LICENSE.txt
+- Mockito 1.10.19 (MIT) - https://code.google.com/p/mockito/
+- OkHttp MockWebServer 2.1.0 (Apache 2.0) - https://github.com/square/okhttp/tree/master/mockwebserver
+- Bouncy Castle JDK 6.0 - https://github.com/bcgit/bc-java/blob/master/LICENSE.html
 
 The text of licenses for the above software is included with the
 Jaspersoft Mobile SDK for Android package, in the /licenses folder.

build.gradle

@@ -30,36 +30,31 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath "com.github.dcendents:android-maven-plugin:1.2"
     }
 }
 
 subprojects {
     group = 'com.jaspersoft.android.sdk'
 
-    ext.clientModuleVersion = '1.11'
-    ext.clientModuleVersionCode = 9011100
-
-    ext.androidMinSdkVersion = 9
-    ext.androidBuildToolsVersion = '21.1.2'
-    ext.androidCompileSdkVersion = 21
-    ext.androidTargetSdkVersion = 21
+    ext.clientModuleVersion = '2.3'
 
     repositories {
         jcenter()
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-        maven { url "file://${System.getenv("ANDROID_HOME")}/extras/android/m2repository" }
     }
 }
 
-apply plugin: 'java'  // ensure clean is also triggered for root build folder
+
+// ensure clean is also triggered for root build folder
+apply plugin: 'java'
 apply plugin: 'build-dashboard'
 
 buildDashboard {
     reports.html.destination = "build/"
 }
 
-test.reports.html.enabled = false     // just clean up dashboard from not generated reports
-test.reports.junitXml.enabled = false // just clean up dashboard from not generated reports
+// just clean up dashboard from not generated reports
+test.reports.html.enabled = false
+// just clean up dashboard from not generated reports
+test.reports.junitXml.enabled = false
 

ui/project.properties renamed to buildsystem/integration_env.properties

@@ -22,12 +22,5 @@
 # <http://www.gnu.org/licenses/lgpl>.
 #
 
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-
-android.library=true
-# Project target.
-target=android-16
+servers.config.file=@servers.file.name@
+run.resource.count=@run.resource.count@

buildsystem/servers-default.json

@@ -0,0 +1,11 @@
+[
+  {
+    "url": "http://mobiledemo2.jaspersoft.com/jasperserver-pro/",
+    "auth_config": [
+      {
+        "username": "phoneuser",
+        "password": "phoneuser"
+      }
+    ]
+  }
+]

client/build.gradle

@@ -22,8 +22,7 @@
  * <http://www.gnu.org/licenses/lgpl>.
  */
 
-apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'java'
 
 description = 'js-android-sdk-client'
 version = clientModuleVersion
@@ -34,67 +33,8 @@ ext {
     PUBLISH_VERSION = clientModuleVersion
 }
 
-android {
-    compileSdkVersion androidCompileSdkVersion
-    buildToolsVersion androidBuildToolsVersion
-
-    defaultConfig {
-        minSdkVersion androidMinSdkVersion
-        targetSdkVersion androidTargetSdkVersion
-        versionCode clientModuleVersionCode
-        versionName version
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-        encoding 'ISO-8859-1'
-    }
-    packagingOptions {
-        exclude 'META-INF/notice.txt'
-        exclude 'META-INF/license.txt'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-    }
-    lintOptions {
-        abortOnError false
-    }
-
-    buildTypes {
-        debug {
-            minifyEnabled false
-        }
-    }
-}
-
 dependencies {
-    compile 'com.android.support:support-annotations:22.2.0'
-    compile 'com.google.code.gson:gson:2.3.1'
-    compile 'org.springframework.android:spring-android-rest-template:1.0.1.RELEASE'
-    compile 'com.octo.android.robospice:robospice:1.4.14'
-    compile 'com.octo.android.robospice:robospice-spring-android:1.4.14'
-    compile('org.simpleframework:simple-xml:2.7') {
-        exclude group: 'stax', module: 'stax'
-        exclude group: 'stax', module: 'stax-api'
-        exclude group: 'xpp3', module: 'xpp3'
-    }
-    // Junit
-    testCompile('junit:junit:4.12') {
-        exclude group: 'org.hamcrest'
-    }
-    // JunitParams
-    testCompile('pl.pragmatists:JUnitParams:1.0.4') {
-        exclude group: 'org.hamcrest'
-    }
-    // Hamcrest Matchers for Junit
-    testCompile 'org.hamcrest:hamcrest-integration:1.3'
-    // Mockito
-    testCompile "org.mockito:mockito-core:1.10.19"
-    // Robolectric + Support v4
-    testCompile('org.robolectric:shadows-support-v4:3.0-rc3') {
-        exclude group: 'commons-logging', module: 'commons-logging'
-        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-    }
-    testCompile 'org.robolectric:shadows-httpclient:3.0-rc3'
+    compile project(':js-android-sdk-rx')
 }
 
-apply from: '../scripts/android-release-aar.gradle'
+apply from: '../scripts/release-artifact.gradle'