Skip to content

Commit fc6b1f6

Browse files
committed
Update config
1 parent 7af7a99 commit fc6b1f6

File tree

2 files changed

+44
-60
lines changed

2 files changed

+44
-60
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ gen/
99
_layouts
1010
.DS_Store
1111
gh-pages
12+
/target
13+
14+
# Mac temp file
15+
.DS_Store

pom.xml

Lines changed: 40 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,56 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
3-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
5+
66
<groupId>com.loopj</groupId>
77
<artifactId>android-async-http</artifactId>
8-
<packaging>pom</packaging>
8+
<packaging>apklib</packaging>
99
<version>1.4.3</version>
10-
1110
<name>Android Asynchronous Http Client</name>
1211
<url>http://loopj.com/android-async-http/</url>
1312

14-
<licenses>
15-
<license>
16-
<name>Apache License Version 2.0</name>
17-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
18-
<distribution>repo</distribution>
19-
</license>
20-
</licenses>
21-
22-
<issueManagement>
23-
<system>GitHub Issues</system>
24-
<url>https://github.com/loopj/android-async-http/issues</url>
25-
</issueManagement>
26-
2713
<properties>
28-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
30-
31-
<java.version>1.6</java.version>
32-
<android.version>1.5</android.version>
33-
<android.platform>3</android.platform>
34-
35-
<android-support.version>r3</android-support.version>
14+
<platform.version>2.3.3</platform.version>
3615
</properties>
3716

38-
<dependencyManagement>
39-
<dependencies>
40-
<dependency>
41-
<groupId>com.google.android</groupId>
42-
<artifactId>android</artifactId>
43-
<version>${android.version}</version>
44-
</dependency>
45-
</dependencies>
46-
</dependencyManagement>
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.google.android</groupId>
20+
<artifactId>android</artifactId>
21+
<version>${platform.version}</version>
22+
<scope>provided</scope>
23+
</dependency>
24+
</dependencies>
4725

4826
<build>
4927
<sourceDirectory>src</sourceDirectory>
50-
<pluginManagement>
51-
<plugins>
52-
<plugin>
53-
<groupId>org.apache.maven.plugins</groupId>
54-
<artifactId>maven-compiler-plugin</artifactId>
55-
<version>2.5</version>
56-
<configuration>
57-
<source>${java.version}</source>
58-
<target>${java.version}</target>
59-
</configuration>
60-
</plugin>
61-
62-
<plugin>
63-
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
64-
<artifactId>android-maven-plugin</artifactId>
65-
<version>3.3.0</version>
66-
<configuration>
67-
<sdk>
68-
<platform>${android.platform}</platform>
69-
</sdk>
70-
</configuration>
71-
<extensions>true</extensions>
72-
</plugin>
73-
</plugins>
74-
</pluginManagement>
28+
<plugins>
29+
<plugin>
30+
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
31+
<artifactId>android-maven-plugin</artifactId>
32+
<version>3.5.0</version>
33+
<configuration>
34+
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
35+
<assetsDirectory>${project.basedir}/assets</assetsDirectory>
36+
<resourceDirectory>${project.basedir}/res</resourceDirectory>
37+
<nativeLibrariesDirectory>${project.basedir}/src/main/native</nativeLibrariesDirectory>
38+
<sdk>
39+
<platform>10</platform>
40+
</sdk>
41+
<undeployBeforeDeploy>true</undeployBeforeDeploy>
42+
</configuration>
43+
<extensions>true</extensions>
44+
</plugin>
45+
46+
<plugin>
47+
<artifactId>maven-compiler-plugin</artifactId>
48+
<version>2.3.2</version>
49+
<configuration>
50+
<source>1.6</source>
51+
<target>1.6</target>
52+
</configuration>
53+
</plugin>
54+
</plugins>
7555
</build>
7656
</project>

0 commit comments

Comments
 (0)