Merge "Revert "Add targetPlatform for executable binaries"" into studio-1.2-dev

automerge: 2c05810

* commit '2c0581045e20439c54ff5aec76681e4429389f8b':
  Revert "Add targetPlatform for executable binaries"

1 files changed, 14 insertions, 13 deletions

diff --git a/find_java/build.gradle b/find_java/build.gradle
index 8c1ed43..b359e0a 100644
--- a/find_java/build.gradle
+++ b/find_java/build.gradle
@@ -2,19 +2,17 @@ apply plugin: 'cpp'
 apply plugin: 'sdk-files'
 apply plugin: 'windows-setup'
 
-model {
-    components {
-        findJava(NativeExecutableSpec) {
-            sources {
-                cpp {
-                    source {
-                        srcDir "src/source"
-                        include "**/*.cpp"
-                    }
-                }
+executables {
+    findJava {}
+}
+
+sources {
+    findJava {
+        cpp {
+            source {
+                srcDir "src/source"
+                include "**/*.cpp"
             }
-            targetPlatform "windows32"
-            targetPlatform "windows64"
         }
     }
 }
@@ -41,6 +39,9 @@ sdk {
 }
 
 def getExeName(String name) {
-    return binaries.getByName(name).executableFile
+    // binaries will return a set of binaries
+    def binaries = executables.findJava.binaries.matching { it.name == name }
+    // calling .exeFile on the set returns an array with the result from each item in the set...
+    return binaries.executableFile.get(0)
 }