merge in mnc-release history after reset to mnc-dev
diff --git a/library/standalone-rules.gradle b/library/standalone-rules.gradle
new file mode 100644
index 0000000..692eb96
--- /dev/null
+++ b/library/standalone-rules.gradle
@@ -0,0 +1,31 @@
+/**
+ * Include this gradle file if you are building against this as a standalone gradle library project,
+ * but are defining the compile SDK version and build tools version at the top-level.
+ *
+ * For example, you can include the following in your settings.gradle file:
+ * include ':setup-wizard-lib'
+ * project(':setup-wizard-lib').projectDir = new File(PATH_TO_THIS_DIRECTORY)
+ * project(':setup-wizard-lib').buildFileName = 'standalone-rules.gradle'
+ *
+ * And then you can include the :setup-wizard-lib project as one of your dependencies
+ * dependencies {
+ * compile project(path: ':setup-wizard-lib', configuration: 'icsCompatRelease')
+ * }
+ */
+
+ext {
+ // For standalone project clients, since the source may not be available, we fetch the
+ // dependencies from maven. To add a dependency, you want to specify something like this:
+ // ext {
+ // deps = ['project-name': 'com.example.group:project-name:1.0.0']
+ // }
+ //
+ // And then in rules.gradle you can reference the dependency by
+ // dependencies {
+ // compile deps['project-name']
+ // }
+ //
+ deps = ['support-appcompat-v7': 'com.android.support:appcompat-v7:21.0.0']
+}
+
+apply from: 'rules.gradle'
diff --git a/library/standalone.gradle b/library/standalone.gradle
index 3d9e50f..2bdfe22 100644
--- a/library/standalone.gradle
+++ b/library/standalone.gradle
@@ -14,22 +14,7 @@
* }
*/
-ext {
- // For standalone project clients, since the source may not be available, we fetch the
- // dependencies from maven. To add a dependency, you want to specify something like this:
- // ext {
- // deps = ['project-name': 'com.example.group:project-name:1.0.0']
- // }
- //
- // And then in rules.gradle you can reference the dependency by
- // dependencies {
- // compile deps['project-name']
- // }
- //
- deps = ['support-appcompat-v7': 'com.android.support:appcompat-v7:21.0.0']
-}
-
-apply from: 'rules.gradle'
+apply from: 'standalone-rules.gradle'
android.compileSdkVersion 21
android.buildToolsVersion '21.1.0'
diff --git a/tools/gradle/android.properties b/tools/gradle/android.properties
index b0ee5f3..dbe836f 100644
--- a/tools/gradle/android.properties
+++ b/tools/gradle/android.properties
@@ -1,6 +1,6 @@
// Set the default SDK and build tools version for all apps
compileSdkVersion 21
-buildToolsVersion = '21.1.0'
+buildToolsVersion = '21.1.2'
// enable Java7
compileOptions.sourceCompatibility JavaVersion.VERSION_1_7
