Update dependency com.javiersc.hubdle to v0.5.0-beta.3

| datasource | package | from | to | | ---------- | ----------------------------------------------------- | ------------ | ------------ | | maven | com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin | 0.5.0-beta.2 | 0.5.0-beta.3 |
JavierSegoviaCordoba · Jul 22, 2023 · 3039164 · 3039164
1 parent e2a5c95
commit 3039164
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 38 deletions.
diff --git a/.github/workflows/dump-api.yaml b/.github/workflows/dump-api.yaml
@@ -0,0 +1,11 @@
+name: dump-api
+
+on:
+  workflow_dispatch:
+
+jobs:
+  dump-api:
+    uses: JavierSegoviaCordoba/reusable-workflows/.github/workflows/dump-api.yaml@main
+    with:
+      restore-kotlin-native-cache: false
+    secrets: inherit
diff --git a/build-src/build.gradle.kts b/build-src/build.gradle.kts
@@ -0,0 +1,23 @@
+plugins {
+    kotlin("jvm")
+    `java-gradle-plugin`
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation(gradleKotlinDsl())
+    implementation(hubdle.javiersc.kotlin.kotlinStdlib)
+    implementation(hubdle.jetbrains.kotlin.kotlinGradlePlugin)
+}
+
+gradlePlugin {
+    plugins {
+        register("convention") {
+            id = "convention"
+            implementationClass = "ConventionPlugin"
+        }
+    }
+}
diff --git a/buildSrc/gradle.properties → build-src/gradle.properties b/buildSrc/gradle.properties → build-src/gradle.properties
diff --git a/buildSrc/settings.gradle.kts → build-src/settings.gradle.kts b/buildSrc/settings.gradle.kts → build-src/settings.gradle.kts
diff --git a/build-src/src/main/kotlin/ConventionPlugin.kt b/build-src/src/main/kotlin/ConventionPlugin.kt
@@ -0,0 +1,14 @@
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.the
+import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
+
+open class ConventionPlugin : Plugin<Project> {
+
+    override fun apply(project: Project) {
+        project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
+            val kotlin: KotlinProjectExtension = project.the()
+            GenerateIgnoreClassesTask.register(project, kotlin.sourceSets)
+        }
+    }
+}
diff --git a/.../main/kotlin/GenerateIgnoreClassesTask.kt → .../main/kotlin/GenerateIgnoreClassesTask.kt b/.../main/kotlin/GenerateIgnoreClassesTask.kt → .../main/kotlin/GenerateIgnoreClassesTask.kt
@@ -178,27 +178,29 @@ constructor(
             val generateIgnoreClassesTask: TaskProvider<GenerateIgnoreClassesTask> =
                 project.tasks.register<GenerateIgnoreClassesTask>(TASK_NAME)
 
-            generateIgnoreClassesTask.configure { sourceSets.set(kotlinSourceSetsMap) }
+            generateIgnoreClassesTask.configure { it.sourceSets.set(kotlinSourceSetsMap) }
 
             project.tasks.withType<BaseKotlinCompile>().configureEach {
-                dependsOn(generateIgnoreClassesTask)
+                it.dependsOn(generateIgnoreClassesTask)
             }
 
             project.tasks.withType<KotlinCompile<*>>().configureEach {
-                dependsOn(generateIgnoreClassesTask)
+                it.dependsOn(generateIgnoreClassesTask)
             }
 
-            project.tasks.withType<Jar>().configureEach { dependsOn(generateIgnoreClassesTask) }
+            project.tasks.withType<Jar>().configureEach { it.dependsOn(generateIgnoreClassesTask) }
 
-            project.afterEvaluate {
+            project.afterEvaluate { afterEvaluate ->
                 listOf(
                         "detekt",
                         "spotlessKotlin",
                     )
-                    .forEach { tasks.findByName(it)?.dependsOn(generateIgnoreClassesTask) }
+                    .forEach {
+                        afterEvaluate.tasks.findByName(it)?.dependsOn(generateIgnoreClassesTask)
+                    }
             }
 
-            project.tasks.named(ASSEMBLE_TASK_NAME) { dependsOn(generateIgnoreClassesTask) }
+            project.tasks.named(ASSEMBLE_TASK_NAME) { it.dependsOn(generateIgnoreClassesTask) }
         }
     }
 }
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-hubdle = "0.5.0-beta.2"
+hubdle = "0.5.0-beta.3"
 
 [plugins]
 javiersc-hubdle = { id = "com.javiersc.hubdle", version.ref = "hubdle" }
diff --git a/kotlin-stdlib/api/android/kotlin-stdlib.api b/kotlin-stdlib/api/android/kotlin-stdlib.api
@@ -384,6 +384,7 @@ public final class com/javiersc/kotlin/stdlib/tree/TreeNodeIterators : java/lang
 	public static final field LevelOrder Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
 	public static final field PostOrder Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
 	public static final field PreOrder Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
 	public static fun values ()[Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
 }

diff --git a/kotlin-stdlib/api/jvm/kotlin-stdlib.api b/kotlin-stdlib/api/jvm/kotlin-stdlib.api
@@ -390,6 +390,7 @@ public final class com/javiersc/kotlin/stdlib/tree/TreeNodeIterators : java/lang
 	public static final field LevelOrder Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
 	public static final field PostOrder Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
 	public static final field PreOrder Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
 	public static fun valueOf (Ljava/lang/String;)Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
 	public static fun values ()[Lcom/javiersc/kotlin/stdlib/tree/TreeNodeIterators;
 }

diff --git a/kotlin-test-junit/build.gradle.kts b/kotlin-test-junit/build.gradle.kts
@@ -1,5 +1,9 @@
 import com.javiersc.gradle.properties.extensions.getBooleanProperty
 
+plugins {
+    id("convention")
+}
+
 hubdle {
     config {
         analysis()
@@ -69,10 +73,6 @@ hubdle {
             }
 
             wasm()
-
-            kotlin { //
-                GenerateIgnoreClassesTask.register(project, sourceSets)
-            }
         }
     }
 }
diff --git a/kotlin-test-junit5/build.gradle.kts b/kotlin-test-junit5/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("convention")
+}
+
 hubdle {
     config {
         analysis()
@@ -81,10 +85,6 @@ hubdle {
             }
 
             wasm()
-
-            kotlin {
-                GenerateIgnoreClassesTask.register(project, sourceSets)
-            }
         }
     }
 }
diff --git a/kotlin-test-testng/build.gradle.kts b/kotlin-test-testng/build.gradle.kts
@@ -1,3 +1,7 @@
+plugins {
+    id("convention")
+}
+
 hubdle {
     config {
         analysis()
@@ -81,10 +85,6 @@ hubdle {
             }
 
             wasm()
-
-            kotlin { //
-                GenerateIgnoreClassesTask.register(project, sourceSets)
-            }
         }
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -19,9 +19,3 @@ pluginManagement {
 plugins {
     id("com.javiersc.hubdle")
 }
-
-hubdleSettings {
-    autoInclude {
-        excludedBuilds("buildSrc")
-    }
-}