Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Revert "Revert "Merge branch 'release'""

This reverts commit 67b8bb8f18f854f45a2f5ec52cc9c8a25981e2f2.

This restores the merge attempt from earlier.

    • -0
    • +5
    ./DefaultCapabilitiesConflictHandler.java
  1. … 65 more files in changeset.
Revert "Merge branch 'release'"

This reverts commit c7fdc455dcb9a8016af0ae9bc8b4c43fde1e2d06, reversing

changes made to 9f70d52b74dbc8c71381781b6c155474031b3cf8.

The changes need a wrapper as there are API changes. Reverting for now.

    • -5
    • +0
    ./DefaultCapabilitiesConflictHandler.java
  1. … 65 more files in changeset.
Support variant selection in capability conflict resolution (#10973)

A conflict can also occur between two variants of the same component.

This gives access to the variant name in the selection rule and

evicts nodes that represent the not-selected variant.

    • -0
    • +5
    ./DefaultCapabilitiesConflictHandler.java
  1. … 12 more files in changeset.
Support variant selection in capability conflict resolution

A conflict can also occur between two variants of the same component.

This gives access to the variant name in the selection rule and

evicts nodes that represent the not-selected variant.

    • -0
    • +5
    ./DefaultCapabilitiesConflictHandler.java
  1. … 12 more files in changeset.
Support variant selection in capability conflict resolution

A conflict can also occur between two variants of the same component.

This gives access to the variant name in the selection rule and

evicts nodes that represent the not-selected variant.

    • -0
    • +5
    ./DefaultCapabilitiesConflictHandler.java
  1. … 11 more files in changeset.
Merge remote-tracking branch 'origin/master' into lorinc/use-diamond

    • -3
    • +13
    ./DefaultCapabilitiesConflictHandler.java
  1. … 5 more files in changeset.
Apply `Anonymous type can be replaced with lambda` inspection the whole project

  1. … 666 more files in changeset.
Apply `Explicit type can be replaced with <>` inspection the whole project

    • -3
    • +3
    ./DefaultCapabilitiesConflictHandler.java
  1. … 906 more files in changeset.
Add customizable capability conflict resolution

This commit disables the automatic capability conflict

resolution based on the highest version of a capability

and replaces it with a customizable resolution strategy.

This allows better control on how capability conflicts

are handled: before this change, capabilities could be

automatically upgraded just because they had a higher

version, which is not always acceptable.

The new API gives finer control by providing a DSL on

the resolution strategy which allows:

- explicitly setting "highest wins" strategy for a given

capability

- or choosing explicitly between a list of modules in conflict

for a given capability

It is possible to use a generic _all_ call to configure the

strategy independently of the capability.

Closes #9888

    • -3
    • +13
    ./DefaultCapabilitiesConflictHandler.java
    • -0
    • +34
    ./UserConfiguredCapabilityResolver.java
  1. … 16 more files in changeset.
Add customizable capability conflict resolution

This commit disables the automatic capability conflict

resolution based on the highest version of a capability

and replaces it with a customizable resolution strategy.

This allows better control on how capability conflicts

are handled: before this change, capabilities could be

automatically upgraded just because they had a higher

version, which is not always acceptable.

The new API gives finer control by providing a DSL on

the resolution strategy which allows:

- explicitly setting "highest wins" strategy for a given

capability

- or choosing explicitly between a list of modules in conflict

for a given capability

It is possible to use a generic _all_ call to configure the

strategy independently of the capability.

Closes #9888

    • -3
    • +13
    ./DefaultCapabilitiesConflictHandler.java
    • -0
    • +34
    ./UserConfiguredCapabilityResolver.java
  1. … 16 more files in changeset.
Add customizable capability conflict resolution

This commit disables the automatic capability conflict

resolution based on the highest version of a capability

and replaces it with a customizable resolution strategy.

This allows better control on how capability conflicts

are handled: before this change, capabilities could be

automatically upgraded just because they had a higher

version, which is not always acceptable.

The new API gives finer control by providing a DSL on

the resolution strategy which allows:

- explicitly setting "highest wins" strategy for a given

capability

- or choosing explicitly between a list of modules in conflict

for a given capability

It is possible to use a generic _all_ call to configure the

strategy independently of the capability.

Closes #9888

    • -3
    • +13
    ./DefaultCapabilitiesConflictHandler.java
    • -0
    • +34
    ./UserConfiguredCapabilityResolver.java
  1. … 16 more files in changeset.
Extract anonymous classes to static inner classes

    • -13
    • +21
    ./DefaultCapabilitiesConflictHandler.java
  1. … 145 more files in changeset.
Extract anonymous classes to static inner classes

    • -13
    • +21
    ./DefaultCapabilitiesConflictHandler.java
  1. … 145 more files in changeset.
Extract anonymous classes to static inner classes

    • -13
    • +21
    ./DefaultCapabilitiesConflictHandler.java
  1. … 145 more files in changeset.
Extract anonymous classes to static inner classes

    • -13
    • +21
    ./DefaultCapabilitiesConflictHandler.java
  1. … 145 more files in changeset.
Extract anonymous classes to static inner classes

    • -13
    • +21
    ./DefaultCapabilitiesConflictHandler.java
  1. … 146 more files in changeset.
Organize imports

  1. … 339 more files in changeset.
Replace anonymous classes with lambdas

  1. … 711 more files in changeset.
Replace anonymous classes with lambdas

  1. … 695 more files in changeset.
Remove synthetic accessors for internal private symbol references

    • -8
    • +8
    ./DefaultCapabilitiesConflictHandler.java
  1. … 900 more files in changeset.
Remove synthetic accessors for internal private symbol references

    • -8
    • +8
    ./DefaultCapabilitiesConflictHandler.java
  1. … 900 more files in changeset.
Remove synthetic accessors for internal private symbol references

    • -8
    • +8
    ./DefaultCapabilitiesConflictHandler.java
  1. … 888 more files in changeset.
Remove synthetic accessors for internal private symbol references

    • -8
    • +8
    ./DefaultCapabilitiesConflictHandler.java
  1. … 895 more files in changeset.
Remove synthetic accessors for internal private symbol references

    • -8
    • +8
    ./DefaultCapabilitiesConflictHandler.java
  1. … 900 more files in changeset.
Remove synthetic accessors for internal private symbol references

    • -8
    • +8
    ./DefaultCapabilitiesConflictHandler.java
  1. … 900 more files in changeset.
Add missing @Override to all modules

Signed-off-by: Paul Merlin <paul@gradle.com>

    • -0
    • +2
    ./DefaultCapabilitiesConflictHandler.java
    • -0
    • +2
    ./DefaultConflictResolutionResult.java
  1. … 1003 more files in changeset.
Add missing @Override to all modules

Signed-off-by: Paul Merlin <paul@gradle.com>

    • -0
    • +2
    ./DefaultCapabilitiesConflictHandler.java
    • -0
    • +2
    ./DefaultConflictResolutionResult.java
  1. … 997 more files in changeset.
Add some missing `equals/hashCode`

Some classes are used in hashmaps and relying on the default hashcode

is not a good idea.

    • -1
    • +1
    ./VersionConflictResolutionDetails.java
  1. … 3 more files in changeset.
Add some missing `equals/hashCode`

Some classes are used in hashmaps and relying on the default hashcode

is not a good idea.

    • -1
    • +1
    ./VersionConflictResolutionDetails.java
  1. … 3 more files in changeset.
Add some missing `equals/hashCode`

Some classes are used in hashmaps and relying on the default hashcode

is not a good idea.

    • -1
    • +1
    ./VersionConflictResolutionDetails.java
  1. … 3 more files in changeset.