Added FTP capabilities for Android build. Removed duplicate package-info.java files.

This commit is contained in:
Krazy
2014-05-26 18:40:42 +00:00
parent b5f580b164
commit e1c35e06a2
7 changed files with 145 additions and 194 deletions

5
.gitattributes vendored
View File

@@ -214,7 +214,6 @@ forge-core/src/main/java/forge/item/PreconDeck.java -text
forge-core/src/main/java/forge/item/SealedProduct.java -text forge-core/src/main/java/forge/item/SealedProduct.java -text
forge-core/src/main/java/forge/item/TournamentPack.java -text forge-core/src/main/java/forge/item/TournamentPack.java -text
forge-core/src/main/java/forge/item/package-info.java -text forge-core/src/main/java/forge/item/package-info.java -text
forge-core/src/main/java/forge/package-info.java -text
forge-core/src/main/java/forge/util/Aggregates.java -text forge-core/src/main/java/forge/util/Aggregates.java -text
forge-core/src/main/java/forge/util/BinaryUtil.java -text forge-core/src/main/java/forge/util/BinaryUtil.java -text
forge-core/src/main/java/forge/util/BuildInfo.java -text forge-core/src/main/java/forge/util/BuildInfo.java -text
@@ -242,7 +241,6 @@ forge-core/src/main/java/forge/util/maps/HashMapOfLists.java -text
forge-core/src/main/java/forge/util/maps/MapOfLists.java -text forge-core/src/main/java/forge/util/maps/MapOfLists.java -text
forge-core/src/main/java/forge/util/maps/MapToAmount.java -text forge-core/src/main/java/forge/util/maps/MapToAmount.java -text
forge-core/src/main/java/forge/util/maps/package-info.java -text forge-core/src/main/java/forge/util/maps/package-info.java -text
forge-core/src/main/java/forge/util/package-info.java -text
forge-core/src/main/java/forge/util/storage/IStorage.java -text forge-core/src/main/java/forge/util/storage/IStorage.java -text
forge-core/src/main/java/forge/util/storage/StorageBase.java -text forge-core/src/main/java/forge/util/storage/StorageBase.java -text
forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java -text forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java -text
@@ -640,9 +638,7 @@ forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java svneol=nativ
forge-game/src/main/java/forge/game/zone/Zone.java -text forge-game/src/main/java/forge/game/zone/Zone.java -text
forge-game/src/main/java/forge/game/zone/ZoneType.java -text forge-game/src/main/java/forge/game/zone/ZoneType.java -text
forge-game/src/main/java/forge/game/zone/package-info.java svneol=native#text/plain forge-game/src/main/java/forge/game/zone/package-info.java svneol=native#text/plain
forge-game/src/main/java/forge/package-info.java -text
forge-game/src/main/java/forge/util/Expressions.java -text forge-game/src/main/java/forge/util/Expressions.java -text
forge-game/src/main/java/forge/util/package-info.java -text
forge-gui-android/.classpath -text forge-gui-android/.classpath -text
forge-gui-android/.project -text forge-gui-android/.project -text
forge-gui-android/.settings/org.eclipse.core.resources.prefs -text forge-gui-android/.settings/org.eclipse.core.resources.prefs -text
@@ -16334,7 +16330,6 @@ forge-gui/src/main/java/forge/deck/DeckgenUtil.java -text
forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java -text forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java -text
forge-gui/src/main/java/forge/deck/io/DeckPreferences.java -text forge-gui/src/main/java/forge/deck/io/DeckPreferences.java -text
forge-gui/src/main/java/forge/deck/io/OldDeckParser.java -text forge-gui/src/main/java/forge/deck/io/OldDeckParser.java -text
forge-gui/src/main/java/forge/deck/io/package-info.java svneol=native#text/plain
forge-gui/src/main/java/forge/error/BugReporter.java -text forge-gui/src/main/java/forge/error/BugReporter.java -text
forge-gui/src/main/java/forge/error/ExceptionHandler.java svneol=native#text/plain forge-gui/src/main/java/forge/error/ExceptionHandler.java svneol=native#text/plain
forge-gui/src/main/java/forge/error/package-info.java svneol=native#text/plain forge-gui/src/main/java/forge/error/package-info.java svneol=native#text/plain

View File

@@ -1,8 +0,0 @@
/**
*
*/
/**
* @author Max
*
*/
package forge;

View File

@@ -1,8 +0,0 @@
/**
*
*/
/**
* @author Max
*
*/
package forge.util;

View File

@@ -1,8 +0,0 @@
/**
*
*/
/**
* @author Max
*
*/
package forge;

View File

@@ -1,8 +0,0 @@
/**
*
*/
/**
* @author Max
*
*/
package forge.util;

View File

@@ -2,6 +2,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<properties>
<maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
<packaging.type>jar</packaging.type>
<build.min.memory>-Xms128m</build.min.memory>
<build.max.memory>-Xmx2048m</build.max.memory>
</properties>
<parent> <parent>
<artifactId>forge</artifactId> <artifactId>forge</artifactId>
<groupId>forge</groupId> <groupId>forge</groupId>
@@ -9,8 +16,8 @@
</parent> </parent>
<artifactId>forge-gui-android</artifactId> <artifactId>forge-gui-android</artifactId>
<packaging>apk</packaging> <packaging>${packaging.type}</packaging>
<name>Forge</name> <name>Forge Android</name>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
@@ -22,72 +29,7 @@
<target>1.7</target> <target>1.7</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>3.9.0-rc.1</version>
<extensions>true</extensions>
<configuration>
<sign>
<debug>true</debug>
</sign>
<sdk>
<platform>19</platform>
</sdk>
<dexForceJumbo>true</dexForceJumbo>
<deleteConflictingFiles>true</deleteConflictingFiles>
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
<assetsDirectory>${project.basedir}/assets</assetsDirectory>
<resourceDirectory>${project.basedir}/res</resourceDirectory>
<nativeLibrariesDirectory>${project.basedir}/libs</nativeLibrariesDirectory>
<extractDuplicates>true</extractDuplicates>
<proguard>
<config>${project.basedir}/proguard.cfg</config>
</proguard>
<release>true</release>
</configuration>
</plugin>
</plugins> </plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
com.jayway.maven.plugins.android.generation2
</groupId>
<artifactId>
android-maven-plugin
</artifactId>
<versionRange>
[3.9.0-rc.1,)
</versionRange>
<goals>
<goal>proguard</goal>
<goal>
generate-sources
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build> </build>
<dependencies> <dependencies>
@@ -158,6 +100,9 @@
<profiles> <profiles>
<profile> <profile>
<id>android-debug</id> <id>android-debug</id>
<properties>
<packaging.type>apk</packaging.type>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@@ -185,13 +130,13 @@
<release>true</release> <release>true</release>
<dex> <dex>
<jvmArguments> <jvmArguments>
<argument>-Xms128m</argument> <argument>${build.min.memory}</argument>
<argument>-Xmx2048m</argument> <argument>${build.max.memory}</argument>
</jvmArguments> </jvmArguments>
</dex> </dex>
<jvmArguments> <jvmArguments>
<argument>-Xms128m</argument> <argument>${build.min.memory}</argument>
<argument>-Xmx2048m</argument> <argument>${build.max.memory}</argument>
</jvmArguments> </jvmArguments>
</configuration> </configuration>
</plugin> </plugin>
@@ -199,9 +144,12 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>android-release-build</id> <id>android-release-build</id>
<build> <properties>
<plugins> <packaging.type>apk</packaging.type>
</properties>
<build>
<plugins>
<plugin> <plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId> <groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId> <artifactId>android-maven-plugin</artifactId>
@@ -214,9 +162,9 @@
<sdk> <sdk>
<platform>19</platform> <platform>19</platform>
</sdk> </sdk>
<zipalign> <zipalign>
<verbose>false</verbose> <verbose>false</verbose>
</zipalign> </zipalign>
<dexForceJumbo>true</dexForceJumbo> <dexForceJumbo>true</dexForceJumbo>
<deleteConflictingFiles>true</deleteConflictingFiles> <deleteConflictingFiles>true</deleteConflictingFiles>
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile> <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
@@ -230,77 +178,80 @@
<release>true</release> <release>true</release>
<dex> <dex>
<jvmArguments> <jvmArguments>
<argument>-Xms128m</argument> <argument>${build.min.memory}</argument>
<argument>-Xmx2048m</argument> <argument>${build.max.memory}</argument>
</jvmArguments> </jvmArguments>
</dex> </dex>
<jvmArguments> <jvmArguments>
<argument>-Xms128m</argument> <argument>${build.min.memory}</argument>
<argument>-Xmx2048m</argument> <argument>${build.max.memory}</argument>
</jvmArguments> </jvmArguments>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile> <profile>
<id>android-release-sign</id> <id>android-release-sign</id>
<build> <properties>
<plugins> <packaging.type>apk</packaging.type>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>signing</id>
<goals>
<goal>sign</goal>
<goal>verify</goal>
</goals>
<phase>package</phase>
<inherited>true</inherited>
<configuration>
<removeExistingSignatures>true</removeExistingSignatures>
<archiveDirectory/>
<includes>
<include>${project.build.directory}/${project.build.finalName}/${project.build.finalName}.apk</include>
</includes>
<keystore>${sign.keystore}</keystore>
<alias>${sign.alias}</alias>
<storepass>${sign.storepass}</storepass>
<keypass>${sign.keypass}</keypass>
<verbose>true</verbose>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>signing</id>
<goals>
<goal>sign</goal>
<goal>verify</goal>
</goals>
<phase>package</phase>
<inherited>true</inherited>
<configuration>
<removeExistingSignatures>true</removeExistingSignatures>
<archiveDirectory/>
<includes>
<include>${project.build.directory}/${project.build.finalName}/${project.build.finalName}.apk</include>
</includes>
<keystore>${sign.keystore}</keystore>
<alias>${sign.alias}</alias>
<storepass>${sign.storepass}</storepass>
<keypass>${sign.keypass}</keypass>
<verbose>true</verbose>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId> <groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId> <artifactId>android-maven-plugin</artifactId>
<version>3.9.0-rc.1</version> <version>3.9.0-rc.1</version>
<inherited>true</inherited> <inherited>true</inherited>
<configuration> <configuration>
<sign> <sign>
<debug>false</debug> <debug>false</debug>
</sign> </sign>
<zipalign> <zipalign>
<skip>false</skip> <skip>false</skip>
<verbose>true</verbose> <verbose>true</verbose>
<inputApk>${project.build.directory}/${project.build.finalName}.apk</inputApk> <inputApk>${project.build.directory}/${project.build.finalName}.apk</inputApk>
<outputApk>${project.build.directory}/${project.build.finalName}-signed-aligned.apk</outputApk> <outputApk>${project.build.directory}/${project.build.finalName}-signed-aligned.apk</outputApk>
</zipalign> </zipalign>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>alignApk</id> <id>android-align</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>zipalign</goal> <goal>zipalign</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
@@ -314,20 +265,7 @@
</dependencies> </dependencies>
<executions> <executions>
<execution> <execution>
<id>android-clean</id> <id>android-release-packaging</id>
<phase>clean</phase>
<configuration>
<target>
<mkdir dir="${project.build.directory}" />
<mkdir dir="${project.build.directory}/classes" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>android-apk</id>
<phase>package</phase> <phase>package</phase>
<configuration> <configuration>
<target> <target>
@@ -343,6 +281,7 @@
</copy> </copy>
<mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" /> <mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
<zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" /> <zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/../forge-gui/res/cardsfolder" level="1" />
<zip destfile="${project.build.directory}/${project.build.finalName}/res.zip" basedir="${basedir}/../forge-gui/res" level="1" />
<zip destfile="${project.build.directory}/${project.build.finalName}.zip" basedir="${project.build.directory}/${project.build.finalName}" level="1" /> <zip destfile="${project.build.directory}/${project.build.finalName}.zip" basedir="${project.build.directory}/${project.build.finalName}" level="1" />
</target> </target>
</configuration> </configuration>
@@ -352,8 +291,60 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile>
<profile>
<id>android-release-upload</id>
<properties>
<packaging.type>apk</packaging.type>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>1.4.1</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-commons-net</artifactId>
<version>1.6.5</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>android-ftp</id>
<phase>package</phase>
<configuration>
<target>
<ftp action="mkdir" password="${cardforge.pass}" server="ftp.cardforge.org" userid="${cardforge.user}" passive="true" remotedir="releases/forge/forge-gui-android/${maven.build.timestamp}" />
<ftp password="${cardforge.pass}" server="ftp.cardforge.org" userid="${cardforge.user}" passive="true" remotedir="releases/forge/forge-gui-android/${maven.build.timestamp}/">
<fileset dir="${project.build.directory}/${project.build.finalName}">
<include name="${project.build.finalName}-signed-aligned.apk"/>
<include name="res.zip"/>
</fileset>
</ftp>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile> </profile>
</profiles> </profiles>
</project> </project>

View File

@@ -1,3 +0,0 @@
/** Forge Card Game. */
package forge.deck.io;