Update dependency com.javiersc.hubdle to v0.7.2

| datasource | package | from | to | | ---------- | ----------------------------------------------------- | ----- | ----- | | maven | com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin | 0.6.8 | 0.7.2 |
JavierSegoviaCordoba · Aug 11, 2024 · afcb5dd · afcb5dd
1 parent 8081e1c
commit afcb5dd
Show file tree

Hide file tree

Showing 8 changed files with 332 additions and 256 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,7 +14,7 @@
 
 ### Updated
 
-- `com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin -> 0.6.8`
+- `com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin -> 0.7.2`
 - `gradle -> 8.7`
 
 ## [0.1.0-alpha.16] - 2024-02-13

diff --git a/build-logic/src/main/kotlin/GenerateIgnoreClassesTask.kt b/build-logic/src/main/kotlin/GenerateIgnoreClassesTask.kt
@@ -16,11 +16,12 @@ import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.listProperty
+import org.gradle.kotlin.dsl.mapProperty
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
 import org.jetbrains.kotlin.gradle.tasks.BaseKotlinCompile
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
 abstract class GenerateIgnoreClassesTask
 @Inject
@@ -59,7 +60,7 @@ constructor(
     private val buildGeneratedWithSeparator =
         "build${File.separatorChar}generated${File.separatorChar}"
 
-    @get:Input abstract val sourceSets: MapProperty<String, List<String>>
+    @get:Input val sourceSets: MapProperty<String, List<String>> = objects.mapProperty()
 
     @Input
     val names: ListProperty<String> =
@@ -68,19 +69,20 @@ constructor(
             .convention(
                 sourceSets.map { sourceSets ->
                     sourceSets
+                        .asSequence()
                         .filter { (name, _) -> name.contains("Main") }
                         .filterNot { (name, _) ->
                             listOf(
-                                    "androidNativeMain",
-                                    "appleMain",
-                                    "iosMain",
-                                    "linuxMain",
-                                    "macosMain",
-                                    "mingwMain",
-                                    "nativeMain",
-                                    "tvosMain",
-                                    "watchosMain",
-                                )
+                                "androidNativeMain",
+                                "appleMain",
+                                "iosMain",
+                                "linuxMain",
+                                "macosMain",
+                                "mingwMain",
+                                "nativeMain",
+                                "tvosMain",
+                                "watchosMain",
+                            )
                                 .any { name == it }
                         }
                         .flatMap { (_, dirs) -> dirs }
@@ -91,6 +93,7 @@ constructor(
                                 .substringBeforeLast(mainWithSeparator)
                         }
                         .distinct()
+                        .toList()
                 }
             )
 
@@ -100,7 +103,7 @@ constructor(
             names
                 .get()
                 .map { name ->
-                    project.buildDir.resolve(
+                    project.layout.buildDirectory.asFile.get().resolve(
                         "generated/$name/main/kotlin/com/javiersc/kotlin/test/"
                     )
                 }
@@ -162,7 +165,7 @@ constructor(
     }
 
     companion object {
-        const val TASK_NAME = "generateIgnoreClasses"
+        private const val TASK_NAME = "generateIgnoreClasses"
 
         fun register(
             project: Project,
@@ -184,7 +187,7 @@ constructor(
                 it.dependsOn(generateIgnoreClassesTask)
             }
 
-            project.tasks.withType<KotlinCompile<*>>().configureEach {
+            project.tasks.withType<KotlinCompilationTask<*>>().configureEach {
                 it.dependsOn(generateIgnoreClassesTask)
             }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-hubdle = "0.6.8"
+hubdle = "0.7.2"
 
 [plugins]
 javiersc-hubdle = { id = "com.javiersc.hubdle", version.ref = "hubdle" }
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/kotlin-stdlib/api/kotlin-stdlib.api b/kotlin-stdlib/api/kotlin-stdlib.api
@@ -141,28 +141,60 @@ public final class com/javiersc/kotlin/stdlib/AnsiColorsKt {
 	public static final fun ansiColor (Ljava/lang/String;Lcom/javiersc/kotlin/stdlib/AnsiColor;)Ljava/lang/String;
 }
 
+public final class com/javiersc/kotlin/stdlib/BooleanKt {
+	public static final fun ifFalse (ZLkotlin/jvm/functions/Function0;)Z
+	public static final fun ifTrue (ZLkotlin/jvm/functions/Function0;)Z
+}
+
 public final class com/javiersc/kotlin/stdlib/CollectionsKt {
 	public static final fun capitalize (Ljava/lang/String;)Ljava/lang/String;
 	public static final fun decapitalize (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun eighth (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun eighthOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun fifth (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun fifthOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun forth (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun forthOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun getIndex (Ljava/lang/Iterable;I)Ljava/lang/Object;
 	public static final fun getIndexOrNull (Ljava/lang/Iterable;I)Ljava/lang/Object;
+	public static final fun ninth (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun ninthOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun penultimate (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun penultimateOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun removeDuplicateEmptyLines (Ljava/util/List;)Ljava/lang/String;
 	public static final fun second (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun secondOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun seventh (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun seventhOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun sixth (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun sixthOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun tenth (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun tenthOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun third (Ljava/lang/Iterable;)Ljava/lang/Object;
 	public static final fun thirdOrNull (Ljava/lang/Iterable;)Ljava/lang/Object;
 }
 
+public class com/javiersc/kotlin/stdlib/DirScope : com/javiersc/kotlin/stdlib/FileScope {
+	public fun <init> (Ljava/io/File;)V
+	public final fun dir (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/javiersc/kotlin/stdlib/DirScope;
+	public static synthetic fun dir$default (Lcom/javiersc/kotlin/stdlib/DirScope;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/javiersc/kotlin/stdlib/DirScope;
+}
+
+public class com/javiersc/kotlin/stdlib/FileScope : java/io/File {
+	public fun <init> (Ljava/io/File;)V
+	public final fun file (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/javiersc/kotlin/stdlib/FileScope;
+	public static synthetic fun file$default (Lcom/javiersc/kotlin/stdlib/FileScope;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/javiersc/kotlin/stdlib/FileScope;
+}
+
+public abstract interface annotation class com/javiersc/kotlin/stdlib/FileScopeMarker : java/lang/annotation/Annotation {
+}
+
 public final class com/javiersc/kotlin/stdlib/FilesKt {
 	public static final fun getChildren (Ljava/io/File;)Lkotlin/sequences/Sequence;
 	public static final fun resource (Ljava/lang/String;)Ljava/io/File;
 	public static final fun resourceOrNull (Ljava/lang/String;)Ljava/io/File;
+	public static final fun root (Ljava/io/File;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/javiersc/kotlin/stdlib/DirScope;
+	public static synthetic fun root$default (Ljava/io/File;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/javiersc/kotlin/stdlib/DirScope;
 }
 
 public final class com/javiersc/kotlin/stdlib/StringsKt {
@@ -197,9 +229,17 @@ public final class com/javiersc/kotlin/stdlib/StringsTransformKt {
 	public static final fun transformstring (Ljava/lang/String;)Ljava/lang/String;
 }
 
+public final class com/javiersc/kotlin/stdlib/TKt {
+	public static final fun ifNotNull (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public static final fun ifNull (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public static final fun or (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public static final fun or (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+}
+
 public abstract interface class com/javiersc/kotlin/stdlib/graph/Graph : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
 	public abstract fun asString ()Ljava/lang/String;
 	public abstract fun contains (Ljava/lang/Object;)Z
+	public abstract fun contains (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Z
 	public abstract fun containsCircularVertexes (Ljava/lang/Object;)Z
 	public abstract fun doesNotContainsCircularVertexes (Ljava/lang/Object;)Z
 	public abstract fun getCircularVertexes ()Ljava/util/Map;
@@ -212,13 +252,15 @@ public abstract interface class com/javiersc/kotlin/stdlib/graph/Graph : java/ut
 	public abstract fun renderer (Lkotlin/jvm/functions/Function1;)V
 	public abstract fun setRenderer (Lkotlin/jvm/functions/Function1;)V
 	public abstract fun toGraph ()Lcom/javiersc/kotlin/stdlib/graph/Graph;
-	public abstract fun vertexesFor (Ljava/lang/Object;)Ljava/util/List;
+	public abstract fun toGraphSortedByEdges ()Lcom/javiersc/kotlin/stdlib/graph/Graph;
+	public abstract fun vertexesFor (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
 	public abstract fun vertexesFor ([Ljava/lang/Object;)Ljava/util/List;
 }
 
 public final class com/javiersc/kotlin/stdlib/graph/Graph$DefaultImpls {
 	public static fun asString (Lcom/javiersc/kotlin/stdlib/graph/Graph;)Ljava/lang/String;
 	public static fun contains (Lcom/javiersc/kotlin/stdlib/graph/Graph;Ljava/lang/Object;)Z
+	public static fun contains (Lcom/javiersc/kotlin/stdlib/graph/Graph;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Z
 	public static fun containsCircularVertexes (Lcom/javiersc/kotlin/stdlib/graph/Graph;Ljava/lang/Object;)Z
 	public static fun doesNotContainsCircularVertexes (Lcom/javiersc/kotlin/stdlib/graph/Graph;Ljava/lang/Object;)Z
 	public static fun getCircularVertexes (Lcom/javiersc/kotlin/stdlib/graph/Graph;)Ljava/util/Map;
@@ -228,8 +270,10 @@ public final class com/javiersc/kotlin/stdlib/graph/Graph$DefaultImpls {
 	public static fun getHasMissingVertexes (Lcom/javiersc/kotlin/stdlib/graph/Graph;)Z
 	public static fun renderer (Lcom/javiersc/kotlin/stdlib/graph/Graph;Lkotlin/jvm/functions/Function1;)V
 	public static fun toGraph (Lcom/javiersc/kotlin/stdlib/graph/Graph;)Lcom/javiersc/kotlin/stdlib/graph/Graph;
-	public static fun vertexesFor (Lcom/javiersc/kotlin/stdlib/graph/Graph;Ljava/lang/Object;)Ljava/util/List;
+	public static fun toGraphSortedByEdges (Lcom/javiersc/kotlin/stdlib/graph/Graph;)Lcom/javiersc/kotlin/stdlib/graph/Graph;
+	public static fun vertexesFor (Lcom/javiersc/kotlin/stdlib/graph/Graph;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
 	public static fun vertexesFor (Lcom/javiersc/kotlin/stdlib/graph/Graph;[Ljava/lang/Object;)Ljava/util/List;
+	public static synthetic fun vertexesFor$default (Lcom/javiersc/kotlin/stdlib/graph/Graph;Ljava/lang/Object;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Ljava/util/List;
 }
 
 public final class com/javiersc/kotlin/stdlib/graph/Graph$Edge {
@@ -277,6 +321,7 @@ public final class com/javiersc/kotlin/stdlib/graph/MutableGraph : com/javiersc/
 	public fun computeIfPresent (Lcom/javiersc/kotlin/stdlib/graph/Graph$Vertex;Ljava/util/function/BiFunction;)Ljava/util/List;
 	public synthetic fun computeIfPresent (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
 	public fun contains (Ljava/lang/Object;)Z
+	public fun contains (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Z
 	public fun containsCircularVertexes (Ljava/lang/Object;)Z
 	public fun containsKey (Lcom/javiersc/kotlin/stdlib/graph/Graph$Vertex;)Z
 	public final fun containsKey (Ljava/lang/Object;)Z
@@ -319,9 +364,10 @@ public final class com/javiersc/kotlin/stdlib/graph/MutableGraph : com/javiersc/
 	public fun setRenderer (Lkotlin/jvm/functions/Function1;)V
 	public final fun size ()I
 	public fun toGraph ()Lcom/javiersc/kotlin/stdlib/graph/Graph;
+	public fun toGraphSortedByEdges ()Lcom/javiersc/kotlin/stdlib/graph/Graph;
 	public fun toString ()Ljava/lang/String;
 	public final fun values ()Ljava/util/Collection;
-	public fun vertexesFor (Ljava/lang/Object;)Ljava/util/List;
+	public fun vertexesFor (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Ljava/util/List;
 	public fun vertexesFor ([Ljava/lang/Object;)Ljava/util/List;
 }
 

diff --git a/kotlin-stdlib/common/main/kotlin/com/javiersc/kotlin/stdlib/tree/TreeNode.kt b/kotlin-stdlib/common/main/kotlin/com/javiersc/kotlin/stdlib/tree/TreeNode.kt
@@ -127,7 +127,7 @@ public open class TreeNode<T>(
             if (node == this) return path
         }
         throw TreeNodeException(
-            "The specified tree node $descendant is not the descendant of tree node $this"
+            "The specified tree node $descendant is not the descendant of tree node $this",
         )
     }
 

diff --git a/kotlin-test-junit/api/kotlin-test-junit.api b/kotlin-test-junit/api/kotlin-test-junit.api
@@ -1,6 +1,3 @@
-public abstract interface annotation class com/javiersc/kotlin/test/IgnoreAndroid : java/lang/annotation/Annotation {
-}
-
 public abstract interface annotation class com/javiersc/kotlin/test/IgnoreAndroidNativeArm32 : java/lang/annotation/Annotation {
 }
 
@@ -52,7 +49,7 @@ public abstract interface annotation class com/javiersc/kotlin/test/IgnoreTvosSi
 public abstract interface annotation class com/javiersc/kotlin/test/IgnoreTvosX64 : java/lang/annotation/Annotation {
 }
 
-public abstract interface annotation class com/javiersc/kotlin/test/IgnoreWasm : java/lang/annotation/Annotation {
+public abstract interface annotation class com/javiersc/kotlin/test/IgnoreWasmJs : java/lang/annotation/Annotation {
 }
 
 public abstract interface annotation class com/javiersc/kotlin/test/IgnoreWatchosArm32 : java/lang/annotation/Annotation {

diff --git a/kotlin-test-junit/build.gradle.kts b/kotlin-test-junit/build.gradle.kts
@@ -24,12 +24,20 @@ hubdle {
             common {
                 main {
                     dependencies {
+                        implementation(hubdle.jetbrains.kotlin.test)
                         implementation(hubdle.jetbrains.kotlin.test.annotations.common)
-                        implementation(hubdle.jetbrains.kotlin.test.junit)
                     }
                 }
             }
-            if (getBooleanProperty("android.enabled").orElse(true).get()) android()
+            if (getBooleanProperty("android.enabled").orElse(true).get()) {
+                android {
+                    main { //
+                        dependencies { //
+                            implementation(hubdle.jetbrains.kotlin.test.junit)
+                        }
+                    }
+                }
+            }
             androidNative {
                 androidNativeArm32()
                 androidNativeArm64()
@@ -59,7 +67,13 @@ hubdle {
                     watchosX64()
                 }
             }
-            jvm()
+            jvm {
+                main { //
+                    dependencies { //
+                        implementation(hubdle.jetbrains.kotlin.test.junit)
+                    }
+                }
+            }
             js {
                 browser()
                 nodejs()