java.net.URL is not allow as @input anymore. #132

Author: volker

src/com/inet/gradle/setup/msi/Msi.java

@@ -18,6 +18,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -260,9 +262,21 @@ public SignTool getSignTool() {
      *
      * @return the template
      * @throws MalformedURLException if any error occur
+     * @throws URISyntaxException if any error occur
      */
     @Input
-    public URL getWxsTemplateURL() throws MalformedURLException {
+    public URI getWxsTemplateURI() throws MalformedURLException, URISyntaxException {
+        return getWxsTemplateURL().toURI();
+    }
+
+    /**
+     * Get a URL to a *.wxs file for the WIX Toolset
+     *
+     * @return the template
+     * @throws MalformedURLException if any error occur
+     */
+    @Internal
+    URL getWxsTemplateURL() throws MalformedURLException {
         if( wxsTemplate != null ) {
             return getProject().file( wxsTemplate ).toURI().toURL();
         }
@@ -429,9 +443,21 @@ public void setMultiInstanceCount( int instanceCount ) {
      *
      * @return the URL
      * @throws MalformedURLException if any error occur
+     * @throws URISyntaxException if any error occur
      */
     @Input
-    public URL getMultiInstanceScript() throws MalformedURLException {
+    public URI getMultiInstanceScript() throws MalformedURLException, URISyntaxException {
+        return getMultiInstanceScriptURL().toURI();
+    }
+
+    /**
+     * Get the URL to a vbscript that set the instance name.
+     *
+     * @return the URL
+     * @throws MalformedURLException if any error occur
+     */
+    @Internal
+    URL getMultiInstanceScriptURL() throws MalformedURLException {
         if( multiInstanceScript != null ) {
             return getProject().file( multiInstanceScript ).toURI().toURL();
         }

src/com/inet/gradle/setup/msi/WxsFileBuilder.java

@@ -1452,7 +1452,7 @@ private void addMultiInstanceTransforms() throws IOException {
         // add a vbscript action to set the instance names
         action = getOrCreateChildById( product, "CustomAction", "SetInstanceID" );
         addAttributeIfNotExists( action, "Script", "vbscript" );
-        try( Scanner scanner = new Scanner( task.getMultiInstanceScript().openStream(), "UTF8" ) ) {
+        try( Scanner scanner = new Scanner( task.getMultiInstanceScriptURL().openStream(), "UTF8" ) ) {
             String vbscript = scanner.useDelimiter( "\\A" ).next(); // read the completely file into a string
             vbscript = vbscript.replace( "\r\n", "\n" ); // \n will be replaced with platform default characters. https://bugs.openjdk.java.net/browse/JDK-8133452
             action.setTextContent( vbscript );