Upgrade Astrid projects to Android SDK 15 (eclipse)

github4ry · Nov 21, 2011 · 8404b96 · 8404b96
1 parent 6939175
commit 8404b96
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ lp-translations/
 translations/strings.xml
 .DS_Store
 greendroid/GDCatalog/.project
+api/bin
diff --git a/api/.classpath b/api/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/api/default.properties → api/project.properties b/api/default.properties → api/project.properties
@@ -1,10 +1,10 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 android.library=true

diff --git a/astrid/.classpath b/astrid/.classpath
@@ -30,5 +30,6 @@
 	<classpathentry kind="src" path="astridApi_src"/>
 	<classpathentry kind="src" path="facebook_src"/>
 	<classpathentry exported="true" kind="lib" path="libs/google-api-services-tasks-v1-1.2.5-beta.jar"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/astrid/default.properties → astrid/project.properties b/astrid/default.properties → astrid/project.properties
@@ -1,17 +1,17 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 # Indicates whether an apk should be generated for each density.
 split.density=false
+android.library.reference.3=../facebook/facebook/
 android.library.reference.1=../api/
+android.library.reference.2=../greendroid/GreenDroid/
 # Project target.
 target=android-8
 apk-configurations=
-android.library.reference.2=../greendroid/GreenDroid/
-android.library.reference.3=../facebook/facebook/
diff --git a/facebook/facebook/.classpath b/facebook/facebook/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/facebook/facebook/default.properties → facebook/facebook/project.properties b/facebook/facebook/default.properties → facebook/facebook/project.properties
@@ -1,10 +1,10 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 android.library=true

diff --git a/greendroid/GreenDroid/.classpath b/greendroid/GreenDroid/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/greendroid/GreenDroid/default.properties → greendroid/GreenDroid/project.properties b/greendroid/GreenDroid/default.properties → greendroid/GreenDroid/project.properties
@@ -1,10 +1,10 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 android.library=true

diff --git a/tests/.classpath b/tests/.classpath
@@ -4,5 +4,5 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/default.properties → tests/project.properties b/tests/default.properties → tests/project.properties
@@ -1,10 +1,10 @@
 # This file is automatically generated by Android Tools.
 # Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-# 
+#
 # This file must be checked in Version Control Systems.
-# 
+#
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 # Indicates whether an apk should be generated for each density.