Handl notarization errors

Author: gamma

src/com/inet/gradle/appbundler/OSXNotarize.java

@@ -268,11 +268,12 @@ private void waitWithStatus( String status ) throws InterruptedException {
     @SuppressWarnings( "unchecked" )
     private boolean waitForNotarization( String UUID ) {
 
+        String output = "";
         int acceptedFailureCount = 5;
         List<String> lastErrors = new ArrayList<>();
 
-        try {
-            while( true && acceptedFailureCount > 0 ) {
+        while( true && acceptedFailureCount > 0 ) {
+            try {
 
                 ArrayList<String> command = new ArrayList<>();
                 command.add( "xcrun" );
@@ -281,7 +282,7 @@ private boolean waitForNotarization( String UUID ) {
                 command.add( UUID );
                 addDefaultOptionsToXCRunCommand( command );
 
-                String output = exec( command.toArray( new String[command.size()] ) );
+                output = exec( command.toArray( new String[command.size()] ) );
                 task.getProject().getLogger().debug( output );
 
                 Map<String, Object> plist = Plist.fromXml( output );
@@ -311,9 +312,15 @@ private boolean waitForNotarization( String UUID ) {
                 }
 
                 waitWithStatus( status );
+            } catch( ClassCastException | XmlParseException | InterruptedException e ) {
+                lastErrors.add( e.getMessage() );
+                lastErrors.add( output + "\n\n" );
+                try {
+                    waitWithStatus( null );
+                } catch ( InterruptedException ie ) {
+                    // ignore
+                }
             }
-        } catch( ClassCastException | XmlParseException | InterruptedException e ) {
-            throw new IllegalArgumentException( e );
         }
 
         throw new IllegalArgumentException( String.join( "\n", lastErrors ) );