From 2c821351dfd6b211fd54f5b9c33feb33fdb3d36b Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Wed, 16 Sep 2020 20:37:26 +0700
Subject: [PATCH] [build] Fix stdlib caches in the light distribution

Latest changes in the cache layout has added a new bitcode_deps file
to a cache directory. But a task building a light distribution
bundle doesn't handle this. So such files for stdlib and
kotlinx.cli are missing in the light distribution. This causes
failures when building platform libs and caches at the user side.

This patch fixes this issue by taking the new cache layout into
account in the bundle task.
---
 build.gradle | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 69f93f51d9d..1aa7521d195 100644
--- a/build.gradle
+++ b/build.gradle
@@ -583,11 +583,8 @@ task bundleRegular(type: (isWindows()) ? Zip : Tar) {
         exclude 'klib/testLibrary'
         // Don't include platform libraries into the bundle (generate them at the user side instead).
         exclude 'klib/platform'
-        exclude {
-            // Exclude platform libraries caches too.
-            !it.isDirectory() && it.relativePath.startsWithAny("klib/cache") &&
-                    it.name != "libstdlib-cache.a" && it.name != "libkotlinx-cli-cache.a"
-        }
+        // Exclude platform libraries caches too. Keep caches for stdlib and endorsed libs.
+        exclude 'klib/cache/*/org.jetbrains.kotlin.native.platform.*/**'
         into archiveBaseName
     }
     from(project.rootDir) {