Merge pull request #14 from Jaspersoft/develop

Release 1.10

Author: tomkoptel

build.gradle

@@ -6,23 +6,24 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        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.10'
+    ext.clientModuleVersionCode = 9011000
+
     ext.androidMinSdkVersion = 9
-    ext.androidTargetSdkVersion = 19
-    ext.androidCompileSdkVersion = 19
-    ext.androidBuildToolsVersion = "19.1"
+    ext.androidBuildToolsVersion = '21.1.2'
+    ext.androidCompileSdkVersion = 21
+    ext.androidTargetSdkVersion = 21
 
     repositories {
         jcenter()
-        mavenCentral()
-        mavenLocal()
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven { url "file://${System.getenv("ANDROID_HOME")}/extras/android/m2repository" }
     }

client/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 description = 'js-android-sdk-client'
-version = '1.9.3'
+version = clientModuleVersion
 
 ext {
     PUBLISH_GROUP_ID = group
     PUBLISH_ARTIFACT_ID = description
-    PUBLISH_VERSION = '1.9.3'
+    PUBLISH_VERSION = clientModuleVersion
 }
 
 android {
@@ -17,10 +17,14 @@ android {
     defaultConfig {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode 9010930
+        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'
@@ -39,6 +43,8 @@ android {
 }
 
 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'
@@ -47,6 +53,24 @@ dependencies {
         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'
 }
 
 apply from: '../scripts/android-release-aar.gradle'

client/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,14 @@
+package com.jaspersoft.android.sdk.client;
+
+import android.support.annotation.NonNull;
+
+import org.springframework.http.converter.HttpMessageConverter;
+
+/**
+ * @author Tom Koptel
+ * @since 1.10
+ */
+interface DataTypeConverterCreator<T extends HttpMessageConverter<?>> {
+    @NonNull
+    T create();
+}