Merge branch 'hotfix/3.3.2' into develop

AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/model/ModelExtractor.java

@@ -117,7 +117,7 @@ private void extractAnnotations(AnnotationElementsHolder extractedModel, Set<Str
 	private void addAncestorsElements(Set<TypeElement> elements, TypeElement typeElement) {
 		TypeMirror ancestorTypeMirror = typeElement.getSuperclass();
 
-		if (!isRootObjectClass(ancestorTypeMirror) && ancestorTypeMirror instanceof DeclaredType) {
+		if (!isRootObjectClass(ancestorTypeMirror) && !isAndroidClass(ancestorTypeMirror) && ancestorTypeMirror instanceof DeclaredType) {
 			DeclaredType ancestorDeclaredType = (DeclaredType) ancestorTypeMirror;
 			Element ancestorElement = ancestorDeclaredType.asElement();
 			if (ancestorElement instanceof TypeElement) {
@@ -131,6 +131,10 @@ private boolean isRootObjectClass(TypeMirror typeMirror) {
 		return typeMirror.getKind() == TypeKind.NONE;
 	}
 
+	private boolean isAndroidClass(TypeMirror typeMirror) {
+		return typeMirror.toString().startsWith("android.");
+	}
+
 	private void extractRootElementsAnnotations(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv, AnnotationElementsHolder extractedModel) {
 		for (TypeElement annotation : annotations) {
 			extractedModel.putRootAnnotatedElements(annotation.getQualifiedName().toString(), roundEnv.getElementsAnnotatedWith(annotation));

examples/HelloWorldEclipse/.factorypath

@@ -1,5 +1,5 @@
 <factorypath>
     <factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="WKSPJAR" id="/HelloWorldEclipse/compile-libs/androidannotations-3.3.1.jar" enabled="true" runInBatchMode="false"/>
-    <factorypathentry kind="WKSPJAR" id="/HelloWorldEclipse/libs/androidannotations-api-3.3.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="WKSPJAR" id="/HelloWorldEclipse/compile-libs/androidannotations-3.3.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="WKSPJAR" id="/HelloWorldEclipse/libs/androidannotations-api-3.3.2.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

examples/RoboGuiceExample/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
     dependencies {
         // replace with the current version of the Android plugin
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         // the latest version of the android-apt plugin
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
     }
@@ -16,8 +16,8 @@ repositories {
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'android-apt'
-def AAVersion = '4.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 3.3.1
+apply plugin: 'com.neenbedankt.android-apt'
+def AAVersion = '4.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 3.3.2
 
 dependencies {
     apt "org.androidannotations:androidannotations:$AAVersion"

examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip

examples/gradle/build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
     dependencies {
         // replace with the current version of the Android plugin
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         // the latest version of the android-apt plugin
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
     }
@@ -16,8 +16,8 @@ repositories {
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'android-apt'
-def AAVersion = '4.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 3.3.1
+apply plugin: 'com.neenbedankt.android-apt'
+def AAVersion = '4.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 3.3.2
 
 dependencies {
     apt "org.androidannotations:androidannotations:$AAVersion"

examples/gradle/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip

examples/maveneclipse/pom.xml

@@ -11,7 +11,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<android.version>4.1.1.4</android.version>
 		<android.platform>16</android.platform>
-		<androidannotations.version>3.3.1</androidannotations.version>
+		<androidannotations.version>3.3.2</androidannotations.version>
 		<java.version>1.6</java.version>
 	</properties>
 
@@ -51,12 +51,13 @@
 			<plugin>
 				<groupId>com.simpligility.maven.plugins</groupId>
 				<artifactId>android-maven-plugin</artifactId>
-				<version>4.2.0</version>
+				<version>4.3.0</version>
 				<configuration>
 					<sdk>
 						<platform>${android.platform}</platform>
 					</sdk>
 					<undeployBeforeDeploy>true</undeployBeforeDeploy>
+					<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
 				</configuration>
 				<extensions>true</extensions>
 			</plugin>