Merge branch 'Android-N' of https://github.com/danielpassos/aerogear-…

…android-pipe
aerogear · Nov 16, 2016 · fceb713 · fceb713
2 parents 3199124 + 7942e3c
commit fceb713
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 59 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,37 +3,43 @@
 sudo: required
 dist: precise
 
-language: android
-
 notifications:
   irc: "irc.freenode.org#aerogear"
 
+language: android
+
 jdk:
   - oraclejdk8
-  - oraclejdk7
 
 android:
   components:
     - platform-tools
     - tools
-    - build-tools-23.0.3
-    - android-23
+    - build-tools-24.0.3
+    - android-24
     - extra-google-m2repository
     - extra-android-m2repository
-    - sys-img-armeabi-v7a-android-23
 
 env:
-  global:
-    - RELEASE_VERSION=$(grep "<version>" pom.xml | tr "\n" ":" | cut -d ':' -f1 | sed s/\<version\>//g| sed s/\"//g| sed s/\<\\/version\>//g | tr -d ' ')
   matrix:
-    - ANDROID_SDK=android-23 ANDROID_EMULATOR=android-23 ANDROID_ABI=armeabi-v7a
+    - ANDROID_SDK="android-24" ANDROID_EMULATOR="android-16" ANDROID_ABI="armeabi-v7a" ANDROID_PKGS="sys-img-armeabi-v7a-android-16"
+    - ANDROID_SDK="android-24" ANDROID_EMULATOR="android-17" ANDROID_ABI="armeabi-v7a" ANDROID_PKGS="sys-img-armeabi-v7a-android-17"
+    - ANDROID_SDK="android-24" ANDROID_EMULATOR="android-18" ANDROID_ABI="armeabi-v7a" ANDROID_PKGS="sys-img-armeabi-v7a-android-18"
+    - ANDROID_SDK="android-24" ANDROID_EMULATOR="android-19" ANDROID_ABI="armeabi-v7a" ANDROID_PKGS="sys-img-armeabi-v7a-android-19"
+    - ANDROID_SDK="android-24" ANDROID_EMULATOR="android-21" ANDROID_ABI="armeabi-v7a" ANDROID_PKGS="sys-img-armeabi-v7a-android-21"
+    - ANDROID_SDK="android-24" ANDROID_EMULATOR="android-22" ANDROID_ABI="armeabi-v7a" ANDROID_PKGS="sys-img-armeabi-v7a-android-22"
+    - ANDROID_SDK="android-24" ANDROID_EMULATOR="android-23" ANDROID_ABI="armeabi-v7a" ANDROID_PKGS="sys-img-armeabi-v7a-android-23"
+    - ANDROID_SDK="android-24" ANDROID_EMULATOR="android-24" ANDROID_ABI="armeabi-v7a" ANDROID_PKGS="sys-img-armeabi-v7a-android-24"
 
 before_install:
 
   #################################################
   ########## maven-android-sdk-deployer ###########
   #################################################
 
+  # Install Android dependencies only on this Matrix
+  - echo y | android update sdk --no-ui --all --filter ${ANDROID_EMULATOR},${ANDROID_PKGS}
+
   # Checkout maven-android-sdk-deployer
   - git clone git://github.com/mosabua/maven-android-sdk-deployer.git
 
@@ -58,19 +64,7 @@ before_install:
 
 before_script:
 
-  # Create emulator
   - echo no | android create avd --force -n test -t $ANDROID_EMULATOR --abi $ANDROID_ABI
-
-script:
-  - mvn install -Drelease
-  - cd aerogear-android-pipe-test
-  - mvn package -DskipTests=true;
-
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - wget https://raw.githubusercontent.com/travis-ci/travis-cookbooks/master/community-cookbooks/android-sdk/files/default/android-wait-for-emulator
-  - chmod a+x ./android-wait-for-emulator
-  - ./android-wait-for-emulator
-  - adb shell input keyevent 82
-  - adb shell df
-  - adb install target/aerogear-android-pipe-test-$RELEASE_VERSION.apk
-  - mvn android:instrument
+  - emulator -avd test -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
diff --git a/aerogear-android-pipe-test/pom.xml b/aerogear-android-pipe-test/pom.xml
@@ -116,20 +116,14 @@
             <type>aar</type>
         </dependency>
 
-        <dependency>
-            <groupId>com.android.support</groupId>
-            <artifactId>support-v4</artifactId>
-            <version>23.4.0</version>
-            <type>aar</type>
-        </dependency>
-
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>com.simpligility.maven.plugins</groupId>
                 <artifactId>android-maven-plugin</artifactId>
+                <version>${maven.android.plugin.version}</version>
                 <configuration>
                     <test>
                         <debug>${android.debug}</debug>

diff --git a/...oid-pipe-test/src/main/java/org/jboss/aerogear/android/pipe/test/http/HttpHelperTest.java b/...oid-pipe-test/src/main/java/org/jboss/aerogear/android/pipe/test/http/HttpHelperTest.java
@@ -19,8 +19,8 @@
 import android.support.test.runner.AndroidJUnit4;
 import java.util.HashMap;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotSame;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
 import org.jboss.aerogear.android.pipe.http.HeaderAndBody;
 import org.jboss.aerogear.android.pipe.http.HttpException;
 import org.junit.Test;

diff --git a/...pe-test/src/main/java/org/jboss/aerogear/android/pipe/test/http/HttpRestProviderTest.java b/...pe-test/src/main/java/org/jboss/aerogear/android/pipe/test/http/HttpRestProviderTest.java
@@ -37,9 +37,9 @@
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
 import org.jboss.aerogear.android.core.Provider;
 import org.jboss.aerogear.android.pipe.http.HeaderAndBody;
 import org.jboss.aerogear.android.pipe.http.HttpException;

diff --git a/...oid-pipe-test/src/main/java/org/jboss/aerogear/android/pipe/test/loader/CallbackTest.java b/...oid-pipe-test/src/main/java/org/jboss/aerogear/android/pipe/test/loader/CallbackTest.java
@@ -24,9 +24,9 @@
 import android.support.v4.app.FragmentManager.OnBackStackChangedListener;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import org.jboss.aerogear.android.pipe.callback.AbstractActivityCallback;
 import org.jboss.aerogear.android.pipe.callback.AbstractFragmentCallback;
 import org.jboss.aerogear.android.pipe.callback.AbstractSupportFragmentCallback;

diff --git a/...ipe-test/src/main/java/org/jboss/aerogear/android/pipe/test/loader/LoaderAdapterTest.java b/...ipe-test/src/main/java/org/jboss/aerogear/android/pipe/test/loader/LoaderAdapterTest.java
@@ -37,7 +37,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import junit.framework.Assert;
+
 
 import org.jboss.aerogear.android.pipe.loader.LoaderAdapter;
 import org.jboss.aerogear.android.pipe.loader.ReadLoader;
@@ -62,6 +62,7 @@
 import org.jboss.aerogear.android.pipe.Pipe;
 import org.jboss.aerogear.android.pipe.PipeHandler;
 import org.json.JSONObject;
+import org.junit.Assert;
 import org.mockito.Mockito;
 
 import android.annotation.TargetApi;
@@ -80,8 +81,8 @@
 import com.google.gson.JsonSerializer;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import org.jboss.aerogear.android.pipe.test.util.PatchedActivityInstrumentationTestCase;
 import org.jboss.aerogear.android.pipe.callback.AbstractFragmentCallback;
 import org.jboss.aerogear.android.pipe.PipeManager;

diff --git a/...id-pipe-test/src/main/java/org/jboss/aerogear/android/pipe/test/rest/RestAdapterTest.java b/...id-pipe-test/src/main/java/org/jboss/aerogear/android/pipe/test/rest/RestAdapterTest.java
@@ -19,7 +19,7 @@
 import android.graphics.Point;
 import android.support.test.runner.AndroidJUnit4;
 import com.google.gson.*;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.jboss.aerogear.android.core.Callback;
 import org.jboss.aerogear.android.core.Provider;
 import org.jboss.aerogear.android.core.ReadFilter;
@@ -64,11 +64,11 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/.../src/main/java/org/jboss/aerogear/android/pipe/test/rest/gson/GsonResponseParserTest.java b/.../src/main/java/org/jboss/aerogear/android/pipe/test/rest/gson/GsonResponseParserTest.java
@@ -18,7 +18,7 @@
 
 
 import android.support.test.runner.AndroidJUnit4;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.jboss.aerogear.android.pipe.http.HeaderAndBody;
 import org.jboss.aerogear.android.pipe.rest.gson.GsonResponseParser;
 import org.jboss.aerogear.android.pipe.test.helper.Data;

diff --git a/aerogear-android-pipe/pom.xml b/aerogear-android-pipe/pom.xml
@@ -41,11 +41,10 @@
     <properties>
 
         <!-- Dependencies versions -->
-        <aerogear.android.core.version>3.0.0</aerogear.android.core.version>
+        <aerogear.android.core.version>3.1.0</aerogear.android.core.version>
 
         <!-- Plugins versions -->
-        <maven.javadoc.plugin.version>2.10.3</maven.javadoc.plugin.version>
-        <builder.helper.plugin.version>1.10</builder.helper.plugin.version>
+        <builder.helper.plugin.version>1.12</builder.helper.plugin.version>
 
     </properties>
 
@@ -73,7 +72,7 @@
         <dependency>
             <groupId>com.android.support</groupId>
             <artifactId>support-v4</artifactId>
-            <version>23.4.0</version>
+            <version>24.2.1</version>
             <type>aar</type>
         </dependency>
     </dependencies>
@@ -83,6 +82,7 @@
             <plugin>
                 <groupId>com.simpligility.maven.plugins</groupId>
                 <artifactId>android-maven-plugin</artifactId>
+                <version>${maven.android.plugin.version}</version>
                 <configuration>
                     <run>
                         <debug>${android.debug}</debug>
@@ -108,7 +108,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven.javadoc.plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

diff --git a/aerogear-android-pipe/src/main/AndroidManifest.xml b/aerogear-android-pipe/src/main/AndroidManifest.xml
@@ -19,5 +19,5 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.jboss.aerogear.android.pipe">
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24"/>
 </manifest>
diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.jboss.aerogear</groupId>
         <artifactId>aerogear-parent</artifactId>
-        <version>0.2.20</version>
+        <version>0.2.21</version>
     </parent>
 
     <modules>
@@ -45,13 +45,13 @@
     <properties>
 
         <!-- Dependencies versions -->
-        <aerogear.bom.version>0.2.20</aerogear.bom.version>
+        <aerogear.bom.version>0.2.21</aerogear.bom.version>
 
         <!-- Plugins versions -->
-        <maven.android.plugin.version>4.4.1</maven.android.plugin.version>
+        <maven.android.plugin.version>4.4.3</maven.android.plugin.version>
 
         <!-- Android configs -->
-        <android.platform>23</android.platform>
+        <android.platform>24</android.platform>
         <android.debug>false</android.debug>
         <proguard.skip>true</proguard.skip>