From 240ff7fcb1e021731b55653664362079a4cc5b8c Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Sat, 12 Jan 2013 12:42:10 -0500 Subject: [PATCH] Added Exception Handler Library as a sub module Signed-off-by: Ricky Barrette --- .gitmodules | 3 ++ .../Build Auto Increment.launch | 2 +- ExaltedDice/.project~ | 33 +++++++++++++++++++ .../.settings/org.eclipse.jdt.core.prefs | 4 +++ ExaltedDice/AndroidManifest.xml | 4 +-- ExaltedDice/project.properties | 6 ++-- exception_handler_library | 1 + 7 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 .gitmodules create mode 100755 ExaltedDice/.project~ create mode 100644 ExaltedDice/.settings/org.eclipse.jdt.core.prefs create mode 160000 exception_handler_library diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d561104 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "exception_handler_library"] + path = exception_handler_library + url = ssh://dev/srv/git/exception_handler_library.git diff --git a/ExaltedDice/.externalToolBuilders/Build Auto Increment.launch b/ExaltedDice/.externalToolBuilders/Build Auto Increment.launch index 16a58c1..a050a19 100644 --- a/ExaltedDice/.externalToolBuilders/Build Auto Increment.launch +++ b/ExaltedDice/.externalToolBuilders/Build Auto Increment.launch @@ -3,7 +3,7 @@ - + diff --git a/ExaltedDice/.project~ b/ExaltedDice/.project~ new file mode 100755 index 0000000..9075306 --- /dev/null +++ b/ExaltedDice/.project~ @@ -0,0 +1,33 @@ + + + ExaltedDice + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/ExaltedDice/.settings/org.eclipse.jdt.core.prefs b/ExaltedDice/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..b080d2d --- /dev/null +++ b/ExaltedDice/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/ExaltedDice/AndroidManifest.xml b/ExaltedDice/AndroidManifest.xml index 2c76b18..60b91ec 100755 --- a/ExaltedDice/AndroidManifest.xml +++ b/ExaltedDice/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="85" + android:versionName="5dd35f3" > diff --git a/ExaltedDice/project.properties b/ExaltedDice/project.properties index a5793c5..3e3c0b8 100644 --- a/ExaltedDice/project.properties +++ b/ExaltedDice/project.properties @@ -9,6 +9,6 @@ # Indicates whether an apk should be generated for each density. # Project target. -target=android-15 -android.library.reference.1=../../exception_handler_library/ExceptionHandlerLib -proguard.config=proguard.cfg \ No newline at end of file +target=android-17 +android.library.reference.1=../exception_handler_library/ExceptionHandlerLib +proguard.config=proguard.cfg diff --git a/exception_handler_library b/exception_handler_library new file mode 160000 index 0000000..ab75dd3 --- /dev/null +++ b/exception_handler_library @@ -0,0 +1 @@ +Subproject commit ab75dd3bb19fa67ba536a9b397adf8e8c46f0d8c