Publish Gradle Module Metadata with Variants #3683
Closed
Commits on Jun 28, 2023
-
Add integration test for resolving Guava with Gradle
- only using POM metadata (Gradle 5) - using Gradle Module Metadata (Gradle 6)
-
-
-
Use correct version for parents
The 'android' and 'jre' variant each have their own parent and they should use that one in Gradle Module Metadata.
-
This causes integration tests to fail. The first failure: Execution failed for task ':androidJava6RuntimeClasspathJava:testClasspath'. > Expected: [failureaccess-1.0.1.jar, guava-HEAD-android-SNAPSHOT.jar] Actual: [checker-compat-qual-2.5.5.jar, error_prone_annotations-2.3.4.jar, failureaccess-1.0.1.jar, guava-HEAD-android-SNAPSHOT.jar, j2objc-annotations-1.3.jar, jsr305-3.0.2.jar]
-
Also fix typo when looking up configuration.
This makes the test pass again, this time because it's testing what we want :)
-
-
-
Conservatively keep most deps on the runtime classpath.
As of this commit, we'll remove only j2objc-annotations. The other artifacts contain at least some annotations with RUNTIME visibility (IIRC). (Even this change could theoretically affect users who assume that they can read CLASS-retention annotations (of which j2objc-annotations has some) from bytecode and find them in the runtime classpath. But that seems unlikely, especially for j2objc annotations.) We may consider being more aggressive in the future.
-
-
Make Android projects always select a 'android' variant by default
This is done by setting 'com.android.build.api.attributes.BuildTypeAttr' to 'jre' in the 'jre' variants. Which indicates that these variants are unsuited for the usual Android build types (release, debug, ...).
-
-
Add test cases for selecting a different variant via constraint
This shows that version constraints can be used to: - Select the 'jre' variant in an Android project - Select the 'android' variant in a Java project, even if the jvm target version is 8+
-
Use 'org.gradle.jvm.environment' attribute
This attribute is supported by Gradle 7 and AGP 7 See: - gradle/gradle#15430 - https://issuetracker.google.com/issues/179488433
-
-
-
-
-
-
-
Do not run Gradle integration test on Java 8
The Android Gradle Plugin 7.0.0 requires Java 11
-
All variants are now targeting Java 8 or higher
The support for Java versions < 8 in the Android variants has been removed. Jre and Android can now be distinguished by the 'org.gradle.jvm.environment' attribute only. The dependencies are also more similar now which allows some simplification. In particular the removal of the 'checker-compat-qual' dependency in the Android variants.
-
-
-
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.