Merge pull request #6 from 2BAB/dev

Fix: ALL_JAVA_RES merged result does not pass to the final data
2BAB · Apr 1, 2022 · c4935bd · c4935bd
2 parents 0ed773a + 255a0bb
commit c4935bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/buildSrc/src/main/kotlin/me/xx2bab/polyfill/buildscript/BuildConfig.kt b/buildSrc/src/main/kotlin/me/xx2bab/polyfill/buildscript/BuildConfig.kt
@@ -12,7 +12,7 @@ object BuildConfig {
     }
 
     object Versions {
-        const val polyfillDevVersion = "0.6.1"
+        const val polyfillDevVersion = "0.6.2"
 
         val polyfillSourceCompatibilityVersion = JavaVersion.VERSION_1_8
         val polyfillTargetCompatibilityVersion = JavaVersion.VERSION_1_8

diff --git a/polyfill/src/main/kotlin/me/xx2bab/polyfill/jar/JavaResourceMergePreHookConfigureAction.kt b/polyfill/src/main/kotlin/me/xx2bab/polyfill/jar/JavaResourceMergePreHookConfigureAction.kt
@@ -42,8 +42,8 @@ class JavaResourceMergePreHookConfigureAction(
             val externalDepJavaResList = mergeTask.externalLibJavaRes
                 ?.getRegularFiles(project.rootProject.layout.projectDirectory)
                 ?: project.objects.listProperty()
-            subProjectsJavaResList.zip(externalDepJavaResList) { a, b -> a + b }
-            (data as ListProperty<RegularFile>).set(subProjectsJavaResList)
+            val all = subProjectsJavaResList.zip(externalDepJavaResList) { a, b -> a + b }
+            (data as ListProperty<RegularFile>).set(all)
 
 
             // Setup dependencies