Merge pull request kaazing#13 from lloish/develop

lloish · web-flow · commit a2d60e0f9786 · 2016-06-22T16:04:45.000-07:00
Updated build.
diff --git a/.gitignore b/.gitignore
@@ -82,3 +82,7 @@ DerivedData
 *.x86_64
 *.hex
 
+
+android/ws/local.properties
+
+android/jms/local.properties
diff --git a/android/jms/build.gradle b/android/jms/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 
diff --git a/android/jms/local.properties b/android/jms/local.properties
diff --git a/android/ws/build.gradle b/android/ws/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 
diff --git a/android/ws/local.properties b/android/ws/local.properties
diff --git a/android/ws/project.properties b/android/ws/project.properties
@@ -0,0 +1,14 @@
+# 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 edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-10

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`jcenter()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:2.1.0'`
	`7`	`+ classpath 'com.android.tools.build:gradle:2.1.2'`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`