diff --git a/HelloWorld/HelloWorld.iml b/HelloWorld/HelloWorld.iml
index d9c631d..0bb6048 100644
--- a/HelloWorld/HelloWorld.iml
+++ b/HelloWorld/HelloWorld.iml
@@ -1,10 +1,16 @@
+
+
+
+
+
+
+
-
diff --git a/HelloWorld/HelloWorld/HelloWorld-HelloWorld.iml b/HelloWorld/HelloWorld/HelloWorld-HelloWorld.iml
index 8ea14e5..1be136d 100644
--- a/HelloWorld/HelloWorld/HelloWorld-HelloWorld.iml
+++ b/HelloWorld/HelloWorld/HelloWorld-HelloWorld.iml
@@ -22,14 +22,14 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -37,11 +37,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -77,25 +77,23 @@
-
-
-
-
+
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
diff --git a/HelloWorld/HelloWorld/build.gradle b/HelloWorld/HelloWorld/build.gradle
index 43f1955..611e322 100644
--- a/HelloWorld/HelloWorld/build.gradle
+++ b/HelloWorld/HelloWorld/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.9.+'
+ classpath 'com.android.tools.build:gradle:0.12.1+'
}
}
apply plugin: 'android'
@@ -18,7 +18,7 @@ repositories {
android {
compileSdkVersion 19
- buildToolsVersion "19.0.3"
+ buildToolsVersion "19.1.0"
defaultConfig {
minSdkVersion 9
@@ -47,9 +47,9 @@ android {
}
dependencies {
- compile 'com.android.support:appcompat-v7:+'
+ compile 'com.android.support:support-v4:19.0.0'
// By default, this depends on couchbase lite via the maven artifact
- compile 'com.couchbase.lite:couchbase-lite-android:1.0.0-55'
+ compile 'com.couchbase.lite:couchbase-lite-android:0.0.0-451'
}
diff --git a/HelloWorld/HelloWorld/src/main/java/com/couchbase/helloworld/MainActivity.java b/HelloWorld/HelloWorld/src/main/java/com/couchbase/helloworld/MainActivity.java
index 8196dbc..d966a1c 100644
--- a/HelloWorld/HelloWorld/src/main/java/com/couchbase/helloworld/MainActivity.java
+++ b/HelloWorld/HelloWorld/src/main/java/com/couchbase/helloworld/MainActivity.java
@@ -1,8 +1,8 @@
package com.couchbase.helloworld;
+import android.app.Activity;
import android.os.Bundle;
import android.support.v4.app.Fragment;
-import android.support.v7.app.ActionBarActivity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
@@ -21,18 +21,13 @@
import java.util.Map;
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- if (savedInstanceState == null) {
- getSupportFragmentManager().beginTransaction()
- .add(R.id.container, new PlaceholderFragment())
- .commit();
- }
final String TAG = "HelloWorld";
Log.d(TAG, "Begin Hello World App");
diff --git a/HelloWorld/HelloWorld/src/main/res/menu/main.xml b/HelloWorld/HelloWorld/src/main/res/menu/main.xml
index 36a9b84..2b65431 100644
--- a/HelloWorld/HelloWorld/src/main/res/menu/main.xml
+++ b/HelloWorld/HelloWorld/src/main/res/menu/main.xml
@@ -5,6 +5,5 @@
+ android:orderInCategory="100" />
diff --git a/HelloWorld/HelloWorld/src/main/res/values/styles.xml b/HelloWorld/HelloWorld/src/main/res/values/styles.xml
index 766ab99..afab327 100644
--- a/HelloWorld/HelloWorld/src/main/res/values/styles.xml
+++ b/HelloWorld/HelloWorld/src/main/res/values/styles.xml
@@ -1,8 +1,8 @@
-
diff --git a/HelloWorld/gradlew b/HelloWorld/gradlew
old mode 100644
new mode 100755