diff --git a/buildSrc/src/main/kotlin/dev/kord/codegen/gradle/DownloadSourceTask.kt b/buildSrc/src/main/kotlin/dev/kord/codegen/gradle/DownloadSourceTask.kt index 9901ffc..04a1b28 100644 --- a/buildSrc/src/main/kotlin/dev/kord/codegen/gradle/DownloadSourceTask.kt +++ b/buildSrc/src/main/kotlin/dev/kord/codegen/gradle/DownloadSourceTask.kt @@ -28,7 +28,7 @@ abstract class DownloadSourceTask : DefaultTask() { } val artifacts = project.dependencies.createArtifactResolutionQuery() - .forModule(dependency.group!!, dependency.name, dependency.version as String) + .forModule(dependency.group, dependency.name, dependency.version as String) .withArtifacts(JvmLibrary::class.java, SourcesArtifact::class.java) .execute() diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7796c6c..be9831d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kotlin = "2.0.0" -kotlinpoet = "1.17.0" -ksp = "2.0.0-1.0.22" +kotlinpoet = "1.18.1" +ksp = "2.0.0-1.0.24" # The compiled binary of codegen.kt we use to compile codegen.kt itself codegen-kt = "main-SNAPSHOT" @@ -15,7 +15,7 @@ codegen-kotlinpoet = { group = "dev.kord.codegen", name = "kotlinpoet", version codegen-ksp = { group = "dev.kord.codegen", name = "ksp", version = "main-20230912.211940-5" } codegen-ksp-processor = { group = "dev.kord.codegen", name = "ksp-processor", version = "main-20230912.211940-7" } -mockk = { group = "io.mockk", name = "mockk", version = "1.13.11" } +mockk = { group = "io.mockk", name = "mockk", version = "1.13.12" } kotlin-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" } ksp-plugin = { group = "com.google.devtools.ksp", name = "symbol-processing-gradle-plugin", version.ref = "ksp" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..2c35211 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 a441313..09523c0 100644 --- 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- 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 +# ############################################################################## # @@ -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 index 25da30d..9d21a21 100644 --- 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 ########################################################################## diff --git a/ksp/src/main/kotlin/TypeResolvers.kt b/ksp/src/main/kotlin/TypeResolvers.kt index 47c9ebe..4b24b97 100644 --- a/ksp/src/main/kotlin/TypeResolvers.kt +++ b/ksp/src/main/kotlin/TypeResolvers.kt @@ -24,20 +24,16 @@ public inline fun Resolver.getSymbolsWithAnnotation(inD * * @see getAnnotationsByType */ -public inline fun KSAnnotated.getAnnotationsByType(): Sequence { - val annotationKClass = A::class - return this.annotations.filter { - it.shortName.getShortName() == annotationKClass.simpleName && it.annotationType.resolve().declaration - .qualifiedName?.asString() == annotationKClass.qualifiedName - } -} +@OptIn(KspExperimental::class) +public inline fun KSAnnotated.getAnnotationsByType(): Sequence = + getAnnotationsByType(A::class) /** * Returns an [KSAnnotation] from [A]. * * @see getAnnotationsByType */ -public inline fun KSAnnotated.getAnnotationByType(): KSAnnotation = +public inline fun KSAnnotated.getAnnotationByType(): A = getAnnotationsByType().first() /**