Added Maven support, needs Maven Android SDK Deployer

WXFY · May 14, 2013 · 0e7f1b9 · 0e7f1b9
1 parent 4879974
commit 0e7f1b9
Show file tree

Hide file tree

Showing 7 changed files with 271 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,18 +6,29 @@ gen
 .project
 .classpath
 .settings
+.checkstyle
 
 #IntelliJ IDEA
 .idea
 *.iml
+*.ipr
+*.iws
 classes
+gen-external-apklibs
 
 #Maven
 target
 release.properties
 pom.xml.*
 
-#Command line
-local.properties
+#Ant
 build.xml
-proguard-project.txt
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+#Other
+.DS_Store
+tmp
+Thumbs.db
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -3,10 +3,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-
-    <application />
+    <uses-sdk android:minSdkVersion="8" />
 
 </manifest>
diff --git a/library/pom.xml b/library/pom.xml
@@ -0,0 +1,92 @@
+<?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>
+
+	<parent>
+		<groupId>com.astuetz.pagerslidingtabstrip</groupId>
+		<artifactId>pagerslidingtabstrip-parent</artifactId>
+		<version>1.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<name>PagerSlidingTabStrip</name>
+	<artifactId>pagerslidingtabstrip</artifactId>
+	<packaging>apklib</packaging>
+
+	<scm>
+		<url>[email protected]:astuetz/PagerSlidingTabStrip.git</url>
+		<connection>scm:git:git://github.com:astuetz/PagerSlidingTabStrip.git</connection>
+		<developerConnection>scm:git:[email protected]:astuetz/PagerSlidingTabStrip.git</developerConnection>
+	</scm>
+
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<android.version>4.2.2_r2</android.version>
+		<android.version.platform>17</android.version.platform>
+	</properties>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>android</groupId>
+			<artifactId>android</artifactId>
+			<version>${android.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>android.support</groupId>
+			<artifactId>compatibility-v4</artifactId>
+			<version>12</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>2.9</version>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<artifactId>android-maven-plugin</artifactId>
+				<version>3.5.0</version>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,87 @@
+<?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>
+
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+    </parent>
+
+    <groupId>com.astuetz.pagerslidingtabstrip</groupId>
+    <artifactId>pagerslidingtabstrip-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>PagerSlidingTabStrip (Parent)</name>
+    <description>Interactive paging indicator widget, compatible with the ViewPager from the Android Support Library.</description>
+    <url>https://github.com/astuetz/PagerSlidingTabStrip</url>
+    <inceptionYear>2013</inceptionYear>
+
+    <modules>
+        <module>library</module>
+        <module>sample</module>
+    </modules>
+
+    <scm>
+        <url>[email protected]:astuetz/PagerSlidingTabStrip.git</url>
+        <connection>scm:git:git://github.com:astuetz/PagerSlidingTabStrip.git</connection>
+        <developerConnection>scm:git:[email protected]:astuetz/PagerSlidingTabStrip.git</developerConnection>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Apache License Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <android.version>4.1.1.4</android.version>
+        <android.version.platform>16</android.version.platform>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>2.5.1</version>
+                    <configuration>
+                        <source>1.6</source>
+                        <target>1.6</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>2.9</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                    <artifactId>android-maven-plugin</artifactId>
+                    <version>3.4.1</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <sdk>
+                            <platform>${android.version.platform}</platform>
+                        </sdk>
+                        <undeployBeforeDeploy>true</undeployBeforeDeploy>
+                        <lazyLibraryUnpack>true</lazyLibraryUnpack>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>
diff --git a/sample/Thumbs.db b/sample/Thumbs.db
diff --git a/sample/pom.xml b/sample/pom.xml
@@ -0,0 +1,76 @@
+<?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>
+
+	<parent>
+		<groupId>com.astuetz.pagerslidingtabstrip</groupId>
+		<artifactId>pagerslidingtabstrip-parent</artifactId>
+		<version>1.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<name>PagerSlidingTabStrip Sample</name>
+	<artifactId>pagerslidingtabstrip-sample</artifactId>
+	<packaging>apk</packaging>
+
+	<scm>
+		<url>[email protected]:astuetz/PagerSlidingTabStrip.git</url>
+		<connection>scm:git:git://github.com:astuetz/PagerSlidingTabStrip.git</connection>
+		<developerConnection>scm:git:[email protected]:astuetz/PagerSlidingTabStrip.git</developerConnection>
+	</scm>
+
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<android.version>4.2.2_r2</android.version>
+		<android.version.platform>17</android.version.platform>
+	</properties>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>android</groupId>
+			<artifactId>android</artifactId>
+			<version>${android.version}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.astuetz.pagerslidingtabstrip</groupId>
+			<artifactId>library</artifactId>
+			<version>${project.version}</version>
+			<type>apklib</type>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+
+		<plugins>
+			<plugin>
+				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<artifactId>android-maven-plugin</artifactId>
+				<version>3.4.1</version>
+				<extensions>true</extensions>
+				<configuration>
+					<sdk>
+						<platform>${android.version.platform}</platform>
+					</sdk>
+					<undeployBeforeDeploy>true</undeployBeforeDeploy>
+					<lazyLibraryUnpack>true</lazyLibraryUnpack>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/sample/src/com/astuetz/viewpager/extensions/sample/MainActivity.java b/sample/src/com/astuetz/viewpager/extensions/sample/MainActivity.java
@@ -198,4 +198,4 @@ public Fragment getItem(int position) {
 
 	}
 
-}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -198,4 +198,4 @@ public Fragment getItem(int position) {

		}

		}
		}