Update dependencies

| datasource | package | from | to | | ---------- | ----------------------------------------------------- | ----- | ------ | | maven | com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin | 0.6.8 | 0.7.12 | | maven | gradle | 8.7 | 8.10.2 |
JavierSegoviaCordoba · Sep 26, 2024 · 9bedc06 · 9bedc06
1 parent 99343a4
commit 9bedc06
Show file tree

Hide file tree

Showing 17 changed files with 449 additions and 356 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.12"
 
 [plugins]
 javiersc-hubdle = { id = "com.javiersc.hubdle", version.ref = "hubdle" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################