Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update wrapper and rename conventions -> defaults #111

Merged
merged 1 commit into from
Jul 23, 2024
Merged

Update wrapper and rename conventions -> defaults #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/reference/software-features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ In the future, additional types of software features will be added to Declarativ

## Shared Model Defaults

Shared Model Defaults are collections of settings that are applied to all projects in a build that use a given software type. They are shared across all projects in a build. These are declared by referencing the software type in the `conventions` block in the declarative settings file.
Shared Model Defaults are collections of settings that are applied to all projects in a build that use a given software type. They are shared across all projects in a build. These are declared by referencing the software type in the `defaults` block in the declarative settings file.

For example, to declare that all projects that produce Java libraries should produce a library built for Java 11, the `javaLibrary` software type is configured in `settings.gradle.dcl`:

```kotlin
conventions {
defaults {
javaLibrary {
javaVersion = 11
}
Expand Down
2 changes: 1 addition & 1 deletion unified-prototype/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.10-20240703002818+0000-bin.zip
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.10-20240719001820+0000-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion unified-prototype/settings.gradle.dcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencyResolutionManagement {

rootProject.name = "unified-prototype"

conventions {
defaults {
androidLibrary {
jdkVersion = 11
compileSdk = 34
Expand Down
6 changes: 3 additions & 3 deletions ...ndroid/src/integTest/groovy/org/gradle/api/experimental/android/AndroidLibrarySpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AndroidLibrarySpec extends AbstractSpecification {
"""

settingsFile << """
conventions {
defaults {
androidLibrary {
jdkVersion = 17
compileSdk = 34
Expand Down Expand Up @@ -58,7 +58,7 @@ class AndroidLibrarySpec extends AbstractSpecification {
"""

settingsFile << """
conventions {
defaults {
androidLibrary {
jdkVersion = 17
compileSdk = 34
Expand Down Expand Up @@ -99,7 +99,7 @@ class AndroidLibrarySpec extends AbstractSpecification {
"""

settingsFile << """
conventions {
defaults {
androidLibrary {
jdkVersion = 17
compileSdk = 34
Expand Down
Loading