Prepare release

PSDev · Jul 26, 2015 · 996ce80 · 996ce80
1 parent 65b6ef7
commit 996ce80
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Change Log
 ==========
 
-Version 1.8.0 *(IN DEVELOPMENT)*
+Version 1.8.0 *(2015-07-26)*
 ------------------------------
 
 * added BSD 2-Clause License (#47)

diff --git a/library/pom.xml b/library/pom.xml
@@ -40,7 +40,6 @@
             <groupId>com.android.support</groupId>
             <artifactId>appcompat-v7</artifactId>
             <type>aar</type>
-            <optional>true</optional>
         </dependency>
 
         <!-- Nullable support -->
@@ -53,7 +52,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.simpligility.maven.plugins</groupId>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <executions>

diff --git a/pom.xml b/pom.xml
@@ -69,18 +69,18 @@
 
         <!-- Dependency Versions -->
         <junit.version>4.12</junit.version>
-        <robolectric.version>3.0-rc3</robolectric.version>
+        <robolectric.version>3.0</robolectric.version>
         <android.version>5.1.1_r2</android.version>
-        <android-support.version>22.2.0</android-support.version>
+        <android-support.version>22.2.1</android-support.version>
         <jsr305.version>3.0.0</jsr305.version>
 
         <!-- Plugin Versions -->
         <maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
-        <android-maven-plugin.version>4.2.1</android-maven-plugin.version>
+        <android-maven-plugin.version>4.0.0-rc.2</android-maven-plugin.version>
         <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
         <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
         <maven-source-plugin.version>2.4</maven-source-plugin.version>
-        <jacoco-maven-plugin.version>0.7.5.201505241946</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.7.2.201409121644</jacoco-maven-plugin.version>
         <maven-gpg-plugin.version>1.4</maven-gpg-plugin.version>
     </properties>
 
@@ -153,22 +153,34 @@
                 </plugin>
 
                 <plugin>
-                    <groupId>com.simpligility.maven.plugins</groupId>
+                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                     <artifactId>android-maven-plugin</artifactId>
+                    <extensions>true</extensions>
                     <version>${android-maven-plugin.version}</version>
                     <configuration>
+                        <!-- General settings -->
                         <sdk>
+                            <path>${env.ANDROID_HOME}</path>
                             <platform>${android.sdk.platform}</platform>
                         </sdk>
+                        <extractDuplicates>true</extractDuplicates>
+                        <undeployBeforeDeploy>true</undeployBeforeDeploy>
+                        <includeLibsJarsFromApklib>true</includeLibsJarsFromApklib>
+                        <includeLibsJarsFromAar>true</includeLibsJarsFromAar>
+
+                        <!-- Project Structure -->
+                        <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
+                        <assetsDirectory>${project.basedir}/assets</assetsDirectory>
+                        <resourceDirectory>${project.basedir}/res</resourceDirectory>
+                        <nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>
+
+                        <!-- Lint -->
                         <lintEnableLibraries>true</lintEnableLibraries>
                         <lintFailOnError>true</lintFailOnError>
                         <lintEnableHtml>true</lintEnableHtml>
                         <lintConfig>${project.basedir}/lint.xml</lintConfig>
                         <lintSkip>false</lintSkip>
-                        <!-- Keep old project structure -->
-                        <failOnNonStandardStructure>false</failOnNonStandardStructure>
-                        <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
-                        <resourceDirectory>${project.basedir}/res</resourceDirectory>
+
                     </configuration>
                 </plugin>
 

diff --git a/sample/pom.xml b/sample/pom.xml
@@ -47,7 +47,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>com.simpligility.maven.plugins</groupId>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                 <artifactId>android-maven-plugin</artifactId>
                 <extensions>true</extensions>
                 <executions>