Migrate from convention to extension #577
Merged
Conversation
This file contains 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
More details can be found here: google#505
rougsig
commented
Jul 6, 2022
src/main/kotlin/com/google/protobuf/gradle/ProtobufConfiguratorExts.kt
Outdated
Show resolved
Hide resolved
|
Do you think we use separate extensions for Android vs non-Android? That would mean they'd have to have different names, like |
|
DSL for android is not the same as for java/kotlin. Maybe protobuf configuration for android should be inside android Block. It's open question how to separate configuration for java/kotlin, android, kmm, any_other_lang |
protobuf.protobuf property was removed
For now, I've merged them into one. As it was with kotlin. i.e. for android selectors (ofFlavour, etc.) inside a java project, will be returned an empty list of tasks |
ejona86
reviewed
Jul 11, 2022
src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
Outdated
Show resolved
Hide resolved
rougsig
force-pushed
the
convention-extension
branch
from
8500641
to
20f56ca
Compare
rougsig
force-pushed
the
convention-extension
branch
from
20f56ca
to
81fed13
Compare
|
Any updates? |
YifeiZhuang
approved these changes
Jul 15, 2022
ejona86
approved these changes
Jul 15, 2022
bot-gradle
added a commit
to gradle/gradle
that referenced
this pull request
Sep 10, 2022
…from the org.gradle.util package * #21839 For some members of `org.gradle.util.*` deprecation logging could not be added because smoke tested plugins and other third parties don't offer a version that is free of their use: * **Kotlin Gradle Plugin** * `WrapUtil.toDomainObjectSet()` * [KT-53882 - Kotlin Gradle Plugin should not use the deprecated WrapUtil.toDomainObjectSet() function](https://youtrack.jetbrains.com/issue/KT-53882/Kotlin-Gradle-Plugin-should-not-use-the-deprecated-WrapUtiltoDomainObjectSet-function) * #21882 * **Android Gradle Plugin** * `GUtil.toWords(string)` * [ANDROID-245405989 - Android Gradle Plugin should not use the deprecated GUtil.toWords(string) function](https://issuetracker.google.com/issues/245405989) * #21899 * `ConfigureUtil.configure(closure, target)` * [ANDROID-245405989 - Android Gradle Plugin should not use the deprecated ConfigureUtil.configure(closure, target) function](https://issuetracker.google.com/issues/245405994) * #21901 * **Spring Dependency Management Plugin** * `GradleVersion.getNextMajor()` * spring-gradle-plugins/dependency-management-plugin#338 * #21898 * **Google Protobuf Gradle Plugin** * `GUtil.toCamelCase(string)` * google/protobuf-gradle-plugin#604 * #21900 * `ConfigureUtil.configure(closure, target)` * google/protobuf-gradle-plugin#577 * #21901 * **OSDetector Gradle Plugin (via the Protobuf plugin)** * `VersionNumber.*` * google/osdetector-gradle-plugin#24 * #21902 * **Asciidoctor Gradle Plugin / Grolifant** * `CollectionUtils.stringize(collection)` * [GROLIFANT-85 - Grolifant should not use the deprecated CollectionUtils](https://gitlab.com/ysb33rOrg/grolifant/-/issues/85) * #21903 * **Nebula Lint Plugin** * `GUtil.loadProperties(inputStream)` * nebula-plugins/gradle-lint-plugin#378 * #21912 * **Nebula Dependency Lock Plugin** * `NameMatcher` * nebula-plugins/gradle-dependency-lock-plugin#243 * #21913 * **IntelliJ IDEA** * `GUtil.toCamelCase(string)` * `GUtil.toLowerCamelCase(string)` * `GUtil.loadProperties(inputStream)` * `ConfigureUtil.configureByMap(properties, delegate)` * [IDEA-301430 - IntelliJ IDEA should not use deprecated types from the org.gradle.util package](https://youtrack.jetbrains.com/issue/IDEA-301430/IntelliJ-IDEA-should-not-use-deprecated-types-from-the-orggradleutil-package) * #21912 * #21900 * #21914 Co-authored-by: Bo Zhang <bo@gradle.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Background
Gradle convention does not support dsl generation. For automatic dsl generation gradle requires extensions. In that reason while we use convention, we need to write dsl accessors by hand (see ProtobufConfiguratorExts.kt).
Changes
Android/JavaGenerateProtoTaskCollection. Now it one class namedGenerateProtoTaskCollection.Breaking changes
Changes.1. Nowproject.protobuf.protobufis not valid code. User should writeproject.protobuf.Changes.3. User should remove those imports from kotlin gradle scripts:.
com.google.protobuf.gradle.protobuf.
com.google.protobuf.gradle.protoc.
com.google.protobuf.gradle.plugins.
com.google.protobuf.gradle.generateProtoTasks.
com.google.protobuf.gradle.builtins.
com.google.protobuf.gradle.ofSourceSet.
com.google.protobuf.gradle.ofFlavor.
com.google.protobuf.gradle.ofBuildType.
com.google.protobuf.gradle.ofVariant.
com.google.protobuf.gradle.ofNonTest.
com.google.protobuf.gradle.ofTestTest plan
Green pipelines. Production code was changed. Changes does not affect any plugin logic.
References issues: #505