androidannotations · DayS · May 31, 2014 · May 1, 2014 · May 13, 2014 · May 13, 2014
diff --git a/.../androidannotations-api/src/main/java/org/androidannotations/annotations/CustomTitle.java b/.../androidannotations-api/src/main/java/org/androidannotations/annotations/CustomTitle.java
@@ -1,46 +1,46 @@
-/**
- * Copyright (C) 2010-2014 eBusiness Information, Excilys Group
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed To in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.androidannotations.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Use it on {@link EActivity} annotated classes to set a custom title layout.
- * <p/>
- * The annotation value is mandatory and should be one of R.layout.* fields.
- * <p/>
- * <blockquote>
- * 
- * Example :
- * 
- * <pre>
- * &#064;CustomTitle(R.layout.activityTitleLayout)
- * &#064;EActivity(R.layout.main)
- * public class MyActivity extends Activity {
- * 
- * }
- * </pre>
- * 
- * </blockquote>
- */
-@Retention(RetentionPolicy.CLASS)
-@Target(ElementType.TYPE)
-public @interface CustomTitle {
-	int value();
-}
+/**
+ * Copyright (C) 2010-2014 eBusiness Information, Excilys Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed To in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.androidannotations.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Use it on {@link EActivity} annotated classes to set a custom title layout.
+ * <p/>
+ * The annotation value is mandatory and should be one of R.layout.* fields.
+ * <p/>
+ * <blockquote>
+ * 
+ * Example :
+ * 
+ * <pre>
+ * &#064;CustomTitle(R.layout.activityTitleLayout)
+ * &#064;EActivity(R.layout.main)
+ * public class MyActivity extends Activity {
+ * 
+ * }
+ * </pre>
+ * 
+ * </blockquote>
+ */
+@Retention(RetentionPolicy.CLASS)
+@Target(ElementType.TYPE)
+public @interface CustomTitle {
+	int value();
+}
diff --git a/AndroidAnnotations/functional-test-1-5-tests/.settings/org.eclipse.core.resources.prefs b/AndroidAnnotations/functional-test-1-5-tests/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,4 @@
-#Thu Jan 19 14:10:02 CET 2012
 eclipse.preferences.version=1
 encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8
diff --git a/AndroidAnnotations/functional-test-1-5-tests/pom.xml b/AndroidAnnotations/functional-test-1-5-tests/pom.xml
@@ -24,10 +24,23 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.pivotallabs</groupId>
+			<groupId>com.google.android</groupId>
+			<artifactId>support-v4</artifactId>
+			<version>r7</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.robolectric</groupId>
 			<artifactId>robolectric</artifactId>
-			<version>1.1</version>
+			<version>2.3</version>
 			<scope>test</scope>
+
+			<exclusions>
+				<exclusion>
+					<groupId>com.android.support</groupId>
+					<artifactId>support-v4</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.easytesting</groupId>