Permalink
Browse files

merge with hameno's pull request titled 'Fixed outdated documentation…

… and incorrect maven references'
  • Loading branch information...
2 parents 4b89bc1 + 02218e4 commit 40dac0bab204405ed0a1548cec2d6e07b9aaa363 @keyboardsurfer keyboardsurfer committed Oct 11, 2012
Showing with 145 additions and 7 deletions.
  1. +3 −0 .gitignore
  2. +2 −2 README.markdown
  3. +1 −2 library/AndroidManifest.xml
  4. +25 −1 library/pom.xml
  5. +21 −1 pom.xml
  6. +92 −0 sample/build.xml
  7. +1 −1 sample/pom.xml
View
@@ -35,3 +35,6 @@ local.properties
#vi swap files
*.swp
+
+# maven target
+target
View
@@ -58,8 +58,8 @@ After putting Crouton in the repository you can add it as a dependency.
```xml
<dependency>
<artifactId>crouton</artifactId>
- <version>1.1</version>
- <groupId>de.neofonie.mobile</groupId>
+ <version>1.4</version>
+ <groupId>de.neofonie.mobile.app.android.widget</groupId>
</dependency>
```
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-
<!--
~ Copyright 2012 Neofonie Mobile GmbH
~
@@ -19,6 +18,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.neofonie.mobile.app.android.widget.crouton"
android:versionCode="1"
- android:versionName="1.2" >
+ android:versionName="1.4" >
</manifest>
View
@@ -42,10 +42,34 @@
</dependencies>
<build>
- <sourceDirectory>${project.basedir}/src</sourceDirectory>
+ <sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <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>
+ <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>
</plugin>
View
@@ -48,9 +48,28 @@
<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.3.0</version>
+ <version>3.3.2</version>
<extensions>true</extensions>
<configuration>
<sdk>
@@ -60,6 +79,7 @@
<lazyLibraryUnpack>true</lazyLibraryUnpack>
</configuration>
</plugin>
+
</plugins>
</pluginManagement>
</build>
View
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="CroutonDemo" default="help">
+
+ <!-- The local.properties file is created and updated by the 'android' tool.
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. -->
+ <property file="local.properties" />
+
+ <!-- The ant.properties file can be created by you. It is only edited by the
+ 'android' tool to add properties to it.
+ This is the place to change some Ant specific build properties.
+ Here are some properties you may want to change/update:
+
+ source.dir
+ The name of the source directory. Default is 'src'.
+ out.dir
+ The name of the output directory. Default is 'bin'.
+
+ For other overridable properties, look at the beginning of the rules
+ files in the SDK, at tools/ant/build.xml
+
+ Properties related to the SDK location or the project target should
+ be updated using the 'android' tool with the 'update' action.
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems.
+
+ -->
+ <property file="ant.properties" />
+
+ <!-- if sdk.dir was not set from one of the property file, then
+ get it from the ANDROID_HOME env var.
+ This must be done before we load project.properties since
+ the proguard config can use sdk.dir -->
+ <property environment="env" />
+ <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+ <isset property="env.ANDROID_HOME" />
+ </condition>
+
+ <!-- The project.properties file is created and updated by the 'android'
+ tool, as well as ADT.
+
+ This contains project specific properties such as project target, and library
+ dependencies. Lower level build properties are stored in ant.properties
+ (or in .classpath for Eclipse projects).
+
+ This file is an integral part of the build system for your
+ application and should be checked into Version Control Systems. -->
+ <loadproperties srcFile="project.properties" />
+
+ <!-- quick check on sdk.dir -->
+ <fail
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+ unless="sdk.dir"
+ />
+
+ <!--
+ Import per project custom build rules if present at the root of the project.
+ This is the place to put custom intermediary targets such as:
+ -pre-build
+ -pre-compile
+ -post-compile (This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir})
+ -post-package
+ -post-build
+ -pre-clean
+ -->
+ <import file="custom_rules.xml" optional="true" />
+
+ <!-- Import the actual build file.
+
+ To customize existing targets, there are two options:
+ - Customize only one target:
+ - copy/paste the target into this file, *before* the
+ <import> task.
+ - customize it to your needs.
+ - Customize the whole content of build.xml
+ - copy/paste the content of the rules files (minus the top node)
+ into this file, replacing the <import> task.
+ - customize to your needs.
+
+ ***********************
+ ****** IMPORTANT ******
+ ***********************
+ In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+ in order to avoid having your file be overridden by tools such as "android update project"
+ -->
+ <!-- version-tag: 1 -->
+ <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
View
@@ -46,7 +46,7 @@
</dependencies>
<build>
- <sourceDirectory>${project.basedir}/src</sourceDirectory>
+ <sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>

0 comments on commit 40dac0b

Please sign in to comment.