Fixes for Android build on Windows

4 files changed, 30 insertions, 4 deletions

diff --git a/android/build.gradle b/android/build.gradle
index 4e46c89f0a4..831e3fe2c81 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.1.2'
     }
 }
 
diff --git a/android/gradle.properties b/android/gradle.properties
index 40f3ebb46b2..423f1b46ac9 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -26,11 +26,37 @@ prefix =
 
 //
 // Define debug as true if you want to build with debug information,
+//
+// Windows specific options
+//
+
+//
+// The platform uses by the C++ builds, supported values are `x64` and `Win32`,
+// that is required to locate the slice2java compiler in the platform depend
 // false otherwise.
 //
 debug = true
 
 //
+// Set the location of a local Ice Builder for Gradle source directory
+//
+iceBuilderHome =
+
+//
+// The platform uses by the C++ builds, supported values are `x64` and `Win32`,
+// that is required to locate the slice2java compiler in the platform depend
+// directory.
+//
+cppPlatform = Win32
+
+//
+// The configuration uses by the C++ builds, supported values are `Debug` and `Release`,
+// that is required to locate the slice2java compiler in the configuration depend
+// directory.
+//
+cppConfiguration = Release
+
+//
 // Gradle build properties
 //
 org.gradle.daemon = true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 9ba12ec44d1..9b783e89206 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Aug 12 11:59:45 NDT 2015
+#Fri Jul 08 13:39:22 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle
index da99b7239cd..e6bd090ad8d 100644
--- a/java/gradle/ice.gradle
+++ b/java/gradle/ice.gradle
@@ -43,7 +43,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath group: 'com.zeroc.gradle.ice-builder', name: 'slice', version: '1.3.6'
+        classpath group: 'com.zeroc.gradle.ice-builder', name: 'slice', version: '1.3.8'
     }
 }