🐛 avoid adding /**/ mask to Gradle dependencies key

burrunan · Aug 11, 2020 · 6d3e893 · 6d3e893
1 parent d5f863c
commit 6d3e893
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/layered-cache/src/main/kotlin/com/github/burrunan/gradle/cache/dependenciesCache.kt b/layered-cache/src/main/kotlin/com/github/burrunan/gradle/cache/dependenciesCache.kt
@@ -16,12 +16,12 @@
 
 package com.github.burrunan.gradle.cache
 
+import actions.core.debug
 import com.github.burrunan.gradle.github.env.ActionsEnvironment
 import com.github.burrunan.gradle.github.event.ActionsTrigger
 import com.github.burrunan.gradle.github.event.cacheKey
 import com.github.burrunan.gradle.github.suspendingStateVariable
 import com.github.burrunan.gradle.hashFiles
-import actions.core.debug
 
 /**
  * Populate cache only when building a default branch, otherwise treat the cache as read-only.
@@ -70,10 +70,13 @@ suspend fun gradleDependenciesCache(trigger: ActionsTrigger, path: String, gradl
  // We do not want .gradle folder, so we want to have at least one character before .gradle
  "$path/**/?*.gradle",
  "$path/**/*.properties",
- ) + gradleDependenciesCacheKey.split(Regex("[\r\n]+")).map {
- (if (it.startsWith("!")) "!" else "") +
- "$path/**/" + it.trim().trimStart('!')
- },
+ ) + gradleDependenciesCacheKey.split(Regex("[\r\n]+"))
+ .map { it.trim() }
+ .filterNot { it.isEmpty() }
+ .map {
+ (if (it.startsWith("!")) "!" else "") +
+ "$path/**/" + it.trim().trimStart('!')
+ },
  )
 
 suspend fun mavenDependenciesCache(trigger: ActionsTrigger, path: String): Cache =