Exclude Xcode license from the restricted build

Also fix excluding cache files.

build.gradle

@@ -496,6 +496,10 @@ task bundle(type: (isWindows()) ? Zip : Tar) {
         exclude 'klib/testLibrary'
         into baseName
     }
+    from(project.rootDir) {
+        include 'licenses/**'
+        into baseName
+    }
     if (isWindows()) {
         zip64 true
     } else {
@@ -517,7 +521,7 @@ task bundleRestricted(type: Tar) {
                 exclude "klib/platform/${target.name}"
                 exclude {
                     // Exclude platform libraries caches too.
-                    !it.isDirectory && it.relativePath.startsWithAny("klib/cache/${target.name}-g") &&
+                    !it.isDirectory() && it.relativePath.startsWithAny("klib/cache/${target.name}-g") &&
                             it.name != "libstdlib-cache.a"
                 }
             }
@@ -525,6 +529,11 @@ task bundleRestricted(type: Tar) {
         exclude '**/xcode_license.pdf'
         into baseName
     }
+    from(project.rootDir) {
+        include 'licenses/**'
+        exclude '**/xcode_license.pdf'
+        into baseName
+    }
 
     extension = 'tar.gz'
     compression = Compression.GZIP
@@ -545,10 +554,6 @@ configure([bundle, bundleRestricted]) {
         include 'RELEASE_NOTES.md'
         into baseName
     }
-    from(project.rootDir) {
-        include 'licenses/**'
-        into baseName
-    }
 
     destinationDir = file('.')
 }