From ee82e146e55d99d357536836edc2240938aef3c2 Mon Sep 17 00:00:00 2001
From: Philip Schiffer <philip.schiffer@gmail.com>
Date: Wed, 1 Jan 2014 15:38:36 +0100
Subject: [PATCH] Switch to aar packaging (#10)

---
 CHANGELOG.md    | 5 +++++
 library/pom.xml | 4 ++--
 pom.xml         | 4 ++--
 sample/pom.xml  | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 173e6bd..65784bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 1.4.0 *(IN DEVELOPMENT)*
+----------------------------
+
+* Switch to aar packaging (#10)
+
 Version 1.3.0 *(2013-11-24)*
 ----------------------------
 
diff --git a/library/pom.xml b/library/pom.xml
index 1e7e382..bcaa74a 100644
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>de.psdev.licensesdialog</groupId>
         <artifactId>parent</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>licensesdialog</artifactId>
-    <packaging>apklib</packaging>
+    <packaging>aar</packaging>
 
     <name>LicensesDialog (Library)</name>
 
diff --git a/pom.xml b/pom.xml
index beea854..a8ca503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     </description>
     <url>http://psdev.de/LicensesDialog</url>
     <inceptionYear>2013</inceptionYear>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
 
     <modules>
         <module>library</module>
@@ -79,7 +79,7 @@
 
         <!-- Plugin Versions -->
         <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-        <android-maven-plugin.version>3.7.0</android-maven-plugin.version>
+        <android-maven-plugin.version>3.8.2</android-maven-plugin.version>
         <build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
         <maven-release-plugin.version>2.4.1</maven-release-plugin.version>
         <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
diff --git a/sample/pom.xml b/sample/pom.xml
index 440d7aa..5c2c1be 100644
--- a/sample/pom.xml
+++ b/sample/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.psdev.licensesdialog</groupId>
         <artifactId>parent</artifactId>
-        <version>1.3.1-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sample</artifactId>
@@ -36,7 +36,7 @@
             <groupId>de.psdev.licensesdialog</groupId>
             <artifactId>licensesdialog</artifactId>
             <version>${project.version}</version>
-            <type>apklib</type>
+            <type>aar</type>
         </dependency>
     </dependencies>