Apply kotlin-dsl plugin
#125
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- bump Gradle Plugin Publish Plugin version - build script updates & improvements - use Java Toolchains to set Java version - use jvm-test-fixtures plugin for functionalTest sources
- create convention plugins for common and java-specific config - add Gradle version catalog - simplify some build config
- signatures-generator contains the JVM code, and is built using the standard KGP - gradle-plugin contains only the Gradle Plugin code, and is built using Gradle's embedded-Kotlin - Configuration between the two projects is shared using convention-plugins - refactored Maven publication build config
# Conflicts: # modules/gradle-plugin/src/functionalTest/kotlin/test/MixedMarkersTest.kt # modules/gradle-plugin/src/functionalTest/kotlin/test/PublicMarkersTest.kt # modules/signatures-generator/src/functionalTest/resources/examples/classes/ClassInPublicPackage.kt # modules/signatures-generator/src/functionalTest/resources/examples/classes/ClassWithPublicMarkers.dump # modules/signatures-generator/src/functionalTest/resources/examples/classes/ClassWithPublicMarkers.kt # modules/signatures-generator/src/functionalTest/resources/examples/classes/MixedAnnotations.dump # modules/signatures-generator/src/functionalTest/resources/examples/classes/MixedAnnotations.kt # modules/signatures-generator/src/functionalTest/resources/examples/gradle/configuration/publicMarkers/markers.gradle.kts # modules/signatures-generator/src/functionalTest/resources/examples/gradle/configuration/publicMarkers/mixedMarkers.gradle.kts
…ate tasks as cacheable
aSemy
force-pushed
the
feat/use_kotlin-dsl_plugin
branch
from
d48c01a to
4dde5b8
Compare
# Conflicts: # gradle.properties
# Conflicts: # gradle.properties
# Conflicts: # build.gradle.kts
# Conflicts: # gradle.properties
aSemy
force-pushed
the
feat/use_kotlin-dsl_plugin
branch
from
faffe33 to
89c81c6
Compare
qwwdfsad
force-pushed
the
bcv-gradle-rework
branch
from
b5e0510 to
3bec20a
Compare
aSemy
commented
May 1, 2023
| .retainExplicitlyIncludedIfDeclared(publicPackages, publicClasses, publicMarkers) | ||
| .filterOutNonPublic(ignoredPackages, ignoredClasses) | ||
| .filterOutAnnotated(nonPublicMarkers.map(::replaceDots).toSet()) | ||
| .filterOutAnnotated(nonPublicMarkers.map { it.replace(".", "/") }.toSet()) |
Contributor
Author
There was a problem hiding this comment.
Cannot access 'replaceDots': it is internal in 'kotlinx.validation.api'
replaceDots() is now in a separate subproject. Perhaps replaceDots() needs a @RequiresOptIn annotation?
As a quick fix I copied the actual implementation.
Contributor
Author
|
I'm marking this as a draft - I'll come back to it once the required branches have been merged. |
qwwdfsad
force-pushed
the
bcv-gradle-rework
branch
from
14bd77c to
3d46759
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Apply the
kotlin-dslplugin in the BCV Gradle project.This helps align the published plugin with the embedded Kotlin version. It also aids development, as it applies the SAM-with-receiver plugin, so the plugin code more closely resembles the syntax in
*.gradle.ktsfiles.There should be no functional changes as a result of this PR.
Depends on