Merge pull request #7 from 4thline/revert-6-aar

Revert "Generate .aar file instead of .apklib."
4thline · Nov 6, 2014 · 996d978 · 996d978
2 parents 536bb92 + 877b4e1
commit 996d978
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/android/pom.xml b/android/pom.xml
@@ -12,7 +12,7 @@
 
     <name>Seamless Android</name>
     <artifactId>seamless-android</artifactId>
-    <packaging>aar</packaging>
+    <packaging>apklib</packaging>
 
     <build>
         <plugins>
@@ -26,7 +26,7 @@
             </plugin>
 
             <plugin>
-                <groupId>com.simpligility.maven.plugins</groupId>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <version>${android.maven.plugin.version}</version>
                 <extensions>true</extensions>
@@ -104,8 +104,8 @@
         </dependency>
 
         <dependency>
-            <groupId>android.support</groupId>
-            <artifactId>compatibility-v13</artifactId>
+            <groupId>com.android.support</groupId>
+            <artifactId>support-v13</artifactId>
             <version>${android.support.version}</version>
         </dependency>
 

diff --git a/pom.xml b/pom.xml
@@ -85,8 +85,8 @@
         <weld.version>1.1.10.Final</weld.version>
         <kxml.version>2.3.0</kxml.version>
         <android.version>4.0.1.2</android.version>
-        <android.support.version>21.0.1</android.support.version>
-        <android.maven.plugin.version>4.0.0-rc.3</android.maven.plugin.version>
+        <android.support.version>18.0.0</android.support.version>
+        <android.maven.plugin.version>3.8.2</android.maven.plugin.version>
 
     </properties>