-
Notifications
You must be signed in to change notification settings - Fork 403
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.
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
Fixes to allow Configuration Caching in Gradle 6.6+ #591
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7653ea9
[WIP] Fixes to allow Configuration Caching in Gradle 6.6+
41326a7
Add @NotYetImplemented test for minimize() & configuration cache
eskatos a45502d
Refine ConfigurationCacheSpec
eskatos c9e30f1
Fix minimize for configuration cache support
eskatos 6d33d81
Upgradlew to 6.6.1
eskatos 853d522
Remove unnecessary @IgnoreIf in ConfigurationCacheSpec
eskatos File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
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
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
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
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
135 changes: 135 additions & 0 deletions
135
src/test/groovy/com/github/jengelman/gradle/plugins/shadow/ConfigurationCacheSpec.groovy
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| package com.github.jengelman.gradle.plugins.shadow | ||
|
|
||
| import com.github.jengelman.gradle.plugins.shadow.util.PluginSpecification | ||
|
|
||
| class ConfigurationCacheSpec extends PluginSpecification { | ||
|
|
||
| def setup() { | ||
| repo.module('shadow', 'a', '1.0') | ||
| .insertFile('a.properties', 'a') | ||
| .insertFile('a2.properties', 'a2') | ||
| .publish() | ||
| repo.module('shadow', 'b', '1.0') | ||
| .insertFile('b.properties', 'b') | ||
| .publish() | ||
|
|
||
| buildFile << """ | ||
| dependencies { | ||
| compile 'shadow:a:1.0' | ||
| compile 'shadow:b:1.0' | ||
| } | ||
| """.stripIndent() | ||
| } | ||
|
|
||
| def "supports configuration cache"() { | ||
| given: | ||
| file('src/main/java/myapp/Main.java') << """ | ||
| package myapp; | ||
| public class Main { | ||
| public static void main(String[] args) { | ||
| System.out.println("TestApp: Hello World! (" + args[0] + ")"); | ||
| } | ||
| } | ||
| """.stripIndent() | ||
|
|
||
| buildFile << """ | ||
| apply plugin: 'application' | ||
|
|
||
| mainClassName = 'myapp.Main' | ||
|
|
||
| dependencies { | ||
| compile 'shadow:a:1.0' | ||
| } | ||
|
|
||
| runShadow { | ||
| args 'foo' | ||
| } | ||
| """.stripIndent() | ||
|
|
||
| settingsFile << "rootProject.name = 'myapp'" | ||
|
|
||
| when: | ||
| runner.withArguments('--configuration-cache', 'shadowJar').build() | ||
| def result = runner.withArguments('--configuration-cache', 'shadowJar').build() | ||
|
|
||
| then: | ||
| result.output.contains("Reusing configuration cache.") | ||
| } | ||
|
|
||
| def "configuration caching supports includes"() { | ||
| given: | ||
| buildFile << """ | ||
| shadowJar { | ||
| exclude 'a2.properties' | ||
| } | ||
| """.stripIndent() | ||
|
|
||
| when: | ||
| runner.withArguments('--configuration-cache', 'shadowJar').build() | ||
| output.delete() | ||
| def result = runner.withArguments('--configuration-cache', 'shadowJar').build() | ||
|
|
||
| then: | ||
| contains(output, ['a.properties', 'b.properties']) | ||
|
|
||
| and: | ||
| doesNotContain(output, ['a2.properties']) | ||
| result.output.contains("Reusing configuration cache.") | ||
| } | ||
|
|
||
| def "configuration caching supports minimize"() { | ||
| given: | ||
| file('settings.gradle') << """ | ||
| include 'client', 'server' | ||
| """.stripIndent() | ||
|
|
||
| and: | ||
| file('client/src/main/java/client/Client.java') << """ | ||
| package client; | ||
| public class Client {} | ||
| """.stripIndent() | ||
| file('client/build.gradle') << """ | ||
| apply plugin: 'java' | ||
| repositories { maven { url "${repo.uri}" } } | ||
| dependencies { compile 'junit:junit:3.8.2' } | ||
| """.stripIndent() | ||
|
|
||
| and: | ||
| file('server/src/main/java/server/Server.java') << """ | ||
| package server; | ||
| public class Server {} | ||
| """.stripIndent() | ||
| file('server/build.gradle') << """ | ||
| apply plugin: 'java' | ||
| apply plugin: 'com.github.johnrengelman.shadow' | ||
|
|
||
| shadowJar { | ||
| minimize { | ||
| exclude(dependency('junit:junit:.*')) | ||
| } | ||
| } | ||
|
|
||
| repositories { maven { url "${repo.uri}" } } | ||
| dependencies { compile project(':client') } | ||
| """.stripIndent() | ||
|
|
||
| and: | ||
| def output = getFile('server/build/libs/server-all.jar') | ||
|
|
||
| when: | ||
| runner.withArguments('--configuration-cache', 'shadowJar', '-s').build() | ||
| output.delete() | ||
| def result = runner.withArguments('--configuration-cache', 'shadowJar', '-s').build() | ||
|
|
||
| then: | ||
| output.exists() | ||
| contains(output, [ | ||
| 'server/Server.class', | ||
| 'junit/framework/Test.class' | ||
| ]) | ||
| doesNotContain(output, ['client/Client.class']) | ||
|
|
||
| and: | ||
| result.output.contains("Reusing configuration cache.") | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
manifest.attributes support providers: https://twitter.com/VladimirSitnikv/status/1260952932981313544