skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Sign android release build and fix check for Apple classes in GUI.

Browse Source
This commit is contained in:
Maarten Billemont 2014-08-28 09:50:10 -04:00
parent 3225985e1e
commit 3ebef16007
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
MasterPassword/Java/masterpassword-android/pom.xml
View File

@ -25,6 +25,10 @@
<artifactId>android-maven-plugin</artifactId> <artifactId>android-maven-plugin</artifactId>
<configuration> <configuration>
<zipalign>
<verbose>true</verbose>
<skip>false</skip>
</zipalign>
<sdk> <sdk>
<platform>19</platform> <platform>19</platform>
</sdk> </sdk>
@ -33,6 +37,54 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>sign</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<executions>
<execution>
<id>signing</id>
<goals>
<goal>sign</goal>
</goals>
<phase>package</phase>
<inherited>true</inherited>
<configuration>
<archiveDirectory></archiveDirectory>
<includes>
<include>target/*.apk</include>
</includes>
<keystore>release.jks</keystore>
<storepass>${env.PASSWORD}</storepass>
<keypass>${env.PASSWORD}</keypass>
<alias>android</alias>
<arguments>
<argument>-sigalg</argument><argument>MD5withRSA</argument>
<argument>-digestalg</argument><argument>SHA1</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<inherited>true</inherited>
<configuration>
<sign>
<debug>false</debug>
</sign>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<!-- DEPENDENCY MANAGEMENT --> <!-- DEPENDENCY MANAGEMENT -->
<dependencies> <dependencies>

2
MasterPassword/Java/masterpassword-gui/src/main/java/com/lyndir/masterpassword/GUI.java
View File

@ -79,7 +79,7 @@ public class GUI implements UnlockFrame.SignInCallback {
try { try {
gui = TypeUtils.newInstance( AppleGUI.class ); gui = TypeUtils.newInstance( AppleGUI.class );
} }
catch (RuntimeException e) { catch (NoClassDefFoundError e) {
gui = new GUI(); gui = new GUI();
} }
gui.open(); gui.open();