diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index b1d1e31da633..62991c1ef50a 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -1,7 +1,6 @@ rootProject.name = "buildSrc" dependencyResolutionManagement { - @Suppress("UnstableApiUsage") versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) diff --git a/buildSrc/src/main/kotlin/kord-module.gradle.kts b/buildSrc/src/main/kotlin/kord-module.gradle.kts index 02710fa90661..81bf4c9a3964 100644 --- a/buildSrc/src/main/kotlin/kord-module.gradle.kts +++ b/buildSrc/src/main/kotlin/kord-module.gradle.kts @@ -1,3 +1,4 @@ +import com.google.devtools.ksp.gradle.KspTask import org.jetbrains.dokka.gradle.AbstractDokkaLeafTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.net.URL @@ -64,7 +65,7 @@ tasks { // see https://kotlin.github.io/dokka//user_guide/gradle/usage/#configuration-options // make sure ksp generates files before building docs - dependsOn(compileKotlin) + dependsOn(tasks.withType()) failOnWarning.set(true) @@ -109,6 +110,7 @@ tasks { val sourcesJar by registering(Jar::class) { archiveClassifier.set("sources") from(sourceSets.main.get().allSource) + from(tasks.withType()) } val dokkaJar by registering(Jar::class) { @@ -116,7 +118,6 @@ tasks { description = "Assembles Kotlin docs with Dokka" archiveClassifier.set("javadoc") from(dokkaHtml) - dependsOn(dokkaHtml) } withType().configureEach { diff --git a/gradle.properties b/gradle.properties index 7583167ae78a..b28460e2ab10 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,3 @@ kotlin.code.style=official # https://github.com/Kotlin/kotlinx-atomicfu#atomicfu-compiler-plugin kotlinx.atomicfu.enableJvmIrTransformation=true kotlinx.atomicfu.enableJsIrTransformation=true - -# remove when upgrading to gradle 8.0 -# https://docs.gradle.org/7.6/userguide/upgrading_version_7.html#strict-kotlin-dsl-precompiled-scripts-accessors -systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbfa754..ccebba7710de 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bc073f67610a..62f91f15f567 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=312eb12875e1747e05c2f81a4789902d7e4ec5defbd1eefeaccc08acf096505d -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip +distributionSha256Sum=a087ac457494858b9b322f39b61f157e6bd4793f32e3397567e1c60b7d151ff6 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-2-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d65c8..79a61d421cc4 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac