Skip to content

Commit cbfd5f2

Browse files
pyricaupyricau
committed
* Extracting API jar as a separate module, not a classifier any more. It doesn't have dependencies any more, appart from android in "provided" scope (we should aim to remove that in the end)
* No more jarjaring: creating a jar with dependencies instead, used with an assembly bundle (two new modules) * Removing references to Android classes from the annotation processor * Adding missing license files
1 parent c42d4a0 commit cbfd5f2

128 files changed

Lines changed: 575 additions & 197 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AndroidAnnotations/HOW-TO.txt‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎AndroidAnnotations/LICENSE.txt‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎AndroidAnnotations/androidannotations-api/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.classpath
2+
.project
3+
target/
4+

‎AndroidAnnotations/androidannotations-api/.settings/org.eclipse.core.resources.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
eclipse.preferences.version=1
2+
encoding//src/main/java=UTF-8
3+
encoding//src/test/java=UTF-8
4+
encoding/<project>=UTF-8

‎AndroidAnnotations/androidannotations-api/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
3+
org.eclipse.jdt.core.compiler.compliance=1.6
4+
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.source=1.6

‎AndroidAnnotations/androidannotations-api/.settings/org.eclipse.m2e.core.prefs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
activeProfiles=
2+
eclipse.preferences.version=1
3+
resolveWorkspaceProjects=true
4+
version=1

‎AndroidAnnotations/androidannotations-api/pom.xml‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
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">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<parent>
7+
<artifactId>androidannotations-parent</artifactId>
8+
<groupId>com.googlecode.androidannotations</groupId>
9+
<version>2.7-SNAPSHOT</version>
10+
</parent>
11+
12+
<artifactId>androidannotations-api</artifactId>
13+
<description>The API jar containing the annotations and the runtime helpers</description>
14+
<name>AndroidAnnotations API</name>
15+
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>junit</groupId>
20+
<artifactId>junit</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>com.google.android</groupId>
24+
<artifactId>android</artifactId>
25+
<version>1.6_r2</version>
26+
<scope>provided</scope>
27+
</dependency>
28+
</dependencies>
29+
30+
<build>
31+
<plugins>
32+
<plugin>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-compiler-plugin</artifactId>
35+
<configuration>
36+
<source>1.6</source>
37+
<target>1.6</target>
38+
</configuration>
39+
</plugin>
40+
<plugin>
41+
<artifactId>maven-javadoc-plugin</artifactId>
42+
<executions>
43+
<execution>
44+
<id>attach-javadocs</id>
45+
<goals>
46+
<goal>jar</goal>
47+
</goals>
48+
</execution>
49+
</executions>
50+
</plugin>
51+
<plugin>
52+
<artifactId>maven-source-plugin</artifactId>
53+
<executions>
54+
<execution>
55+
<id>attach-sources</id>
56+
<goals>
57+
<goal>jar</goal>
58+
</goals>
59+
</execution>
60+
</executions>
61+
</plugin>
62+
</plugins>
63+
</build>
64+
65+
</project>

AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotations/AfterInject.java renamed to AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterInject.java

File renamed without changes.

AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotations/AfterTextChange.java renamed to AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterTextChange.java

File renamed without changes.

AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/annotations/AfterViews.java renamed to AndroidAnnotations/androidannotations-api/src/main/java/com/googlecode/androidannotations/annotations/AfterViews.java

File renamed without changes.

0 commit comments

Comments
 (0)