Remove deprecated build configuration and libscrypt references.
This commit is contained in:
		@@ -43,5 +43,4 @@ dependencies {
 | 
			
		||||
    compile group: 'org.slf4j', name: 'slf4j-android', version: '1.7.13-underscore'
 | 
			
		||||
    compile group: 'com.jakewharton', name: 'butterknife', version: '8.5.1'
 | 
			
		||||
    annotationProcessor group: 'com.jakewharton', name: 'butterknife-compiler', version: '8.5.1'
 | 
			
		||||
    compile files( 'libs/scrypt-1.4.0-native.jar' )
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							@@ -1,148 +0,0 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
 | 
			
		||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 | 
			
		||||
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 | 
			
		||||
    <modelVersion>4.0.0</modelVersion>
 | 
			
		||||
 | 
			
		||||
    <!-- PROJECT METADATA -->
 | 
			
		||||
    <parent>
 | 
			
		||||
        <groupId>com.lyndir.masterpassword</groupId>
 | 
			
		||||
        <artifactId>masterpassword</artifactId>
 | 
			
		||||
        <version>GIT-SNAPSHOT</version>
 | 
			
		||||
    </parent>
 | 
			
		||||
 | 
			
		||||
    <name>Master Password Android</name>
 | 
			
		||||
    <description>An Android application to the Master Password algorithm</description>
 | 
			
		||||
 | 
			
		||||
    <artifactId>masterpassword-android</artifactId>
 | 
			
		||||
    <packaging>apk</packaging>
 | 
			
		||||
 | 
			
		||||
    <!-- BUILD CONFIGURATION -->
 | 
			
		||||
    <build>
 | 
			
		||||
        <plugins>
 | 
			
		||||
            <plugin>
 | 
			
		||||
                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
 | 
			
		||||
                <artifactId>android-maven-plugin</artifactId>
 | 
			
		||||
 | 
			
		||||
                <configuration>
 | 
			
		||||
                    <zipalign>
 | 
			
		||||
                        <verbose>true</verbose>
 | 
			
		||||
                        <skip>false</skip>
 | 
			
		||||
                    </zipalign>
 | 
			
		||||
                    <sdk>
 | 
			
		||||
                        <platform>21</platform>
 | 
			
		||||
                    </sdk>
 | 
			
		||||
                </configuration>
 | 
			
		||||
            </plugin>
 | 
			
		||||
        </plugins>
 | 
			
		||||
    </build>
 | 
			
		||||
 | 
			
		||||
    <profiles>
 | 
			
		||||
        <profile>
 | 
			
		||||
            <id>release</id>
 | 
			
		||||
            <build>
 | 
			
		||||
                <plugins>
 | 
			
		||||
                    <plugin>
 | 
			
		||||
                        <groupId>com.jayway.maven.plugins.android.generation2</groupId>
 | 
			
		||||
                        <artifactId>android-maven-plugin</artifactId>
 | 
			
		||||
 | 
			
		||||
                        <configuration>
 | 
			
		||||
                            <sign>
 | 
			
		||||
                                <debug>false</debug>
 | 
			
		||||
                            </sign>
 | 
			
		||||
                        </configuration>
 | 
			
		||||
 | 
			
		||||
                        <executions>
 | 
			
		||||
                            <execution>
 | 
			
		||||
                                <id>manifest-update</id>
 | 
			
		||||
                                <phase>process-resources</phase>
 | 
			
		||||
                                <goals>
 | 
			
		||||
                                    <goal>manifest-update</goal>
 | 
			
		||||
                                </goals>
 | 
			
		||||
                                <configuration>
 | 
			
		||||
                                    <manifestVersionCodeUpdateFromVersion>true</manifestVersionCodeUpdateFromVersion>
 | 
			
		||||
                                </configuration>
 | 
			
		||||
                            </execution>
 | 
			
		||||
                        </executions>
 | 
			
		||||
                    </plugin>
 | 
			
		||||
                    <plugin>
 | 
			
		||||
                        <groupId>org.apache.maven.plugins</groupId>
 | 
			
		||||
                        <artifactId>maven-jarsigner-plugin</artifactId>
 | 
			
		||||
                        <version>1.4</version>
 | 
			
		||||
                        <executions>
 | 
			
		||||
                            <execution>
 | 
			
		||||
                                <id>signing</id>
 | 
			
		||||
                                <goals>
 | 
			
		||||
                                    <goal>sign</goal>
 | 
			
		||||
                                </goals>
 | 
			
		||||
                                <phase>package</phase>
 | 
			
		||||
                                <inherited>true</inherited>
 | 
			
		||||
                                <configuration>
 | 
			
		||||
                                    <archiveDirectory />
 | 
			
		||||
                                    <includes>
 | 
			
		||||
                                        <include>target/*.apk</include>
 | 
			
		||||
                                    </includes>
 | 
			
		||||
                                    <keystore>masterpassword.keystore</keystore>
 | 
			
		||||
                                    <storepass>${env.STORE_PW}</storepass>
 | 
			
		||||
                                    <keypass>${env.KEY_PW_ANDROID}</keypass>
 | 
			
		||||
                                    <alias>masterpassword-android</alias>
 | 
			
		||||
                                    <arguments>
 | 
			
		||||
                                        <argument>-sigalg</argument>
 | 
			
		||||
                                        <argument>MD5withRSA</argument>
 | 
			
		||||
                                        <argument>-digestalg</argument>
 | 
			
		||||
                                        <argument>SHA1</argument>
 | 
			
		||||
                                    </arguments>
 | 
			
		||||
                                </configuration>
 | 
			
		||||
                            </execution>
 | 
			
		||||
                        </executions>
 | 
			
		||||
                    </plugin>
 | 
			
		||||
                </plugins>
 | 
			
		||||
            </build>
 | 
			
		||||
        </profile>
 | 
			
		||||
    </profiles>
 | 
			
		||||
 | 
			
		||||
    <!-- DEPENDENCY MANAGEMENT -->
 | 
			
		||||
    <dependencies>
 | 
			
		||||
 | 
			
		||||
        <!-- PROJECT REFERENCES -->
 | 
			
		||||
        <dependency>
 | 
			
		||||
            <groupId>com.lyndir.masterpassword</groupId>
 | 
			
		||||
            <artifactId>masterpassword-algorithm</artifactId>
 | 
			
		||||
            <version>GIT-SNAPSHOT</version>
 | 
			
		||||
        </dependency>
 | 
			
		||||
 | 
			
		||||
        <dependency>
 | 
			
		||||
            <groupId>com.lyndir.masterpassword</groupId>
 | 
			
		||||
            <artifactId>masterpassword-tests</artifactId>
 | 
			
		||||
            <version>GIT-SNAPSHOT</version>
 | 
			
		||||
        </dependency>
 | 
			
		||||
 | 
			
		||||
        <!-- EXTERNAL DEPENDENCIES -->
 | 
			
		||||
        <dependency>
 | 
			
		||||
            <groupId>com.jakewharton</groupId>
 | 
			
		||||
            <artifactId>butterknife</artifactId>
 | 
			
		||||
        </dependency>
 | 
			
		||||
 | 
			
		||||
        <dependency>
 | 
			
		||||
            <groupId>org.slf4j</groupId>
 | 
			
		||||
            <artifactId>slf4j-android</artifactId>
 | 
			
		||||
            <version>1.7.13-underscore</version>
 | 
			
		||||
        </dependency>
 | 
			
		||||
 | 
			
		||||
        <dependency>
 | 
			
		||||
            <groupId>android</groupId>
 | 
			
		||||
            <artifactId>android</artifactId>
 | 
			
		||||
            <version>5.0.1_r2</version>
 | 
			
		||||
        </dependency>
 | 
			
		||||
 | 
			
		||||
        <dependency>
 | 
			
		||||
            <groupId>com.lambdaworks</groupId>
 | 
			
		||||
            <artifactId>scrypt</artifactId>
 | 
			
		||||
            <version>1.4.0-android</version>
 | 
			
		||||
            <type>jar</type>
 | 
			
		||||
            <classifier>native</classifier>
 | 
			
		||||
        </dependency>
 | 
			
		||||
 | 
			
		||||
    </dependencies>
 | 
			
		||||
 | 
			
		||||
</project>
 | 
			
		||||
		Reference in New Issue
	
	Block a user