diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | pom.xml | 460 | ||||
| -rw-r--r-- | project.properties | 1 | ||||
| m--------- | submodules/dslv | 0 |
4 files changed, 237 insertions, 227 deletions
diff --git a/.gitmodules b/.gitmodules index 54b674f60..cd43a243e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "submodules/ViewPagerIndicator"] path = submodules/ViewPagerIndicator url = git://github.com/JakeWharton/Android-ViewPagerIndicator.git +[submodule "submodules/dslv"] + path = submodules/dslv + url = git://github.com/bauerca/drag-sort-listview.git @@ -1,235 +1,241 @@ <?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> - <groupId>de.danoeh</groupId> - <artifactId>antennapod</artifactId> - <packaging>apk</packaging> - <version>0.9.6.4</version> - <name>AntennaPod</name> +<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> + <groupId>de.danoeh</groupId> + <artifactId>antennapod</artifactId> + <packaging>apk</packaging> + <version>0.9.6.4</version> + <name>AntennaPod</name> - <dependencies> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.shredzone.flattr4j</groupId> - <artifactId>flattr4j-core</artifactId> - <version>2.4</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.google.android</groupId> - <artifactId>android</artifactId> - <scope>provided</scope> - <version>4.1.1.4</version> - </dependency> - <dependency> - <groupId>com.actionbarsherlock</groupId> - <artifactId>library</artifactId> - <version>4.1.0</version> - <type>apklib</type> - </dependency> - <dependency> - <groupId>com.viewpagerindicator</groupId> - <artifactId>library</artifactId> - <version>2.3.1</version> - <type>apklib</type> - </dependency> - <dependency> - <groupId>com.google.android</groupId> - <artifactId>annotations</artifactId> - <version>4.1.1.4</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> + </dependency> + <dependency> + <groupId>org.shredzone.flattr4j</groupId> + <artifactId>flattr4j-core</artifactId> + <version>2.4</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.android</groupId> + <artifactId>android</artifactId> + <scope>provided</scope> + <version>4.1.1.4</version> + </dependency> + <dependency> + <groupId>com.actionbarsherlock</groupId> + <artifactId>library</artifactId> + <version>4.1.0</version> + <type>apklib</type> + </dependency> + <dependency> + <groupId>com.viewpagerindicator</groupId> + <artifactId>library</artifactId> + <version>2.3.1</version> + <type>apklib</type> + </dependency> + <dependency> + <groupId>com.google.android</groupId> + <artifactId>annotations</artifactId> + <version>4.1.1.4</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>com.mobeta.android.dslv</groupId> + <artifactId>drag-sort-listview</artifactId> + <version>0.6.1-SNAPSHOT</version> + <type>apklib</type> + </dependency> + </dependencies> - </dependencies> + <build> + <sourceDirectory>src</sourceDirectory> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <groupId>com.jayway.maven.plugins.android.generation2</groupId> + <artifactId>android-maven-plugin</artifactId> + <version>3.5.0</version> + <configuration> + <sdk> + <path>${env.ANDROID_HOME}</path> + <platform>17</platform> + </sdk> + <manifest> + <debuggable>true</debuggable> + </manifest> + </configuration> + <extensions>true</extensions> + <executions> + <execution> + <id>alignApk</id> + <phase>package</phase> + <goals> + <goal>zipalign</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <build> - <sourceDirectory>src</sourceDirectory> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> - <artifactId>android-maven-plugin</artifactId> - <version>3.5.0</version> - <configuration> - <sdk> - <path>${env.ANDROID_HOME}</path> - <platform>17</platform> - </sdk> - <manifest> - <debuggable>true</debuggable> - </manifest> - </configuration> - <extensions>true</extensions> - <executions> - <execution> - <id>alignApk</id> - <phase>package</phase> - <goals> - <goal>zipalign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>development</id> - <!-- using this since activeByDefault does not work well with multiple - profiles --> - <activation> - <property> - <name>environment</name> - <value>!production</value> - </property> - </activation> - <properties> - <deployment.stage>In Development</deployment.stage> - </properties> - </profile> - <profile> - <id>production</id> - <properties> - <deployment.stage>In Production</deployment.stage> - </properties> - </profile> - <profile> - <id>release</id> - <!-- via this activation the profile is automatically used when the release - is done with the maven release plugin --> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jarsigner-plugin</artifactId> - <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.artifactId}-${project.version}.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> - <!-- the signed apk then needs to be zipaligned and we activate proguard - and we run the manifest update --> - <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> - <artifactId>android-maven-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <sign> - <debug>false</debug> - </sign> - <zipalign> - <skip>false</skip> - <verbose>true</verbose> - <inputApk>${project.build.directory}/${project.artifactId}-${project.version}.apk</inputApk> - <outputApk>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk - </outputApk> - </zipalign> - <manifest> - <debuggable>false</debuggable> - <versionCodeAutoIncrement>true</versionCodeAutoIncrement> - </manifest> - <proguard> - <skip>true</skip> - </proguard> - </configuration> - <executions> - <execution> - <id>alignApk</id> - <phase>package</phase> - <goals> - <goal>zipalign</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <configuration> - <artifacts> - <artifact> - <file>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk</file> - <type>apk</type> - <classifier>signed-aligned</classifier> - </artifact> - <artifact> - <file>${project.build.directory}/proguard/mapping.txt</file> - <type>map</type> - <classifier>release</classifier> - </artifact> - </artifacts> - </configuration> - <executions> - <execution> - <id>attach-signed-aligned</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> + <profiles> + <profile> + <id>development</id> + <!-- using this since activeByDefault does not work well with multiple + profiles --> + <activation> + <property> + <name>environment</name> + <value>!production</value> + </property> + </activation> + <properties> + <deployment.stage>In Development</deployment.stage> + </properties> + </profile> + <profile> + <id>production</id> + <properties> + <deployment.stage>In Production</deployment.stage> + </properties> + </profile> + <profile> + <id>release</id> + <!-- via this activation the profile is automatically used when the release + is done with the maven release plugin --> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jarsigner-plugin</artifactId> + <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.artifactId}-${project.version}.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> + <!-- the signed apk then needs to be zipaligned and we activate proguard + and we run the manifest update --> + <plugin> + <groupId>com.jayway.maven.plugins.android.generation2</groupId> + <artifactId>android-maven-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <sign> + <debug>false</debug> + </sign> + <zipalign> + <skip>false</skip> + <verbose>true</verbose> + <inputApk>${project.build.directory}/${project.artifactId}-${project.version}.apk</inputApk> + <outputApk>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk + </outputApk> + </zipalign> + <manifest> + <debuggable>false</debuggable> + <versionCodeAutoIncrement>true</versionCodeAutoIncrement> + </manifest> + <proguard> + <skip>true</skip> + </proguard> + </configuration> + <executions> + <execution> + <id>alignApk</id> + <phase>package</phase> + <goals> + <goal>zipalign</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk</file> + <type>apk</type> + <classifier>signed-aligned</classifier> + </artifact> + <artifact> + <file>${project.build.directory}/proguard/mapping.txt</file> + <type>map</type> + <classifier>release</classifier> + </artifact> + </artifacts> + </configuration> + <executions> + <execution> + <id>attach-signed-aligned</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/project.properties b/project.properties index d1eaa98a8..2706f89b9 100644 --- a/project.properties +++ b/project.properties @@ -12,3 +12,4 @@ proguard.config=proguard.cfg target=android-17 android.library.reference.1=submodules/ActionBarSherlock/library android.library.reference.2=submodules/ViewPagerIndicator/library +android.library.reference.3=submodules/dslv/library diff --git a/submodules/dslv b/submodules/dslv new file mode 160000 +Subproject c5f07d473a48325d0f12994025fce525c3027e2 |