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

Replace deprecated usage of Distribution.getBaseName #151

Closed
wants to merge 1 commit into from
Closed

Replace deprecated usage of Distribution.getBaseName #151

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
2 changes: 1 addition & 1 deletion README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To engage in the development of the plugin, follow the minimum requirements show
|==========================
|Tool |Minimum Version
|JDK |Oracle JDK or OpenJDK 8.x, anything higher won't work with Scala 2.11
|Gradle |5.1 or higher
|Gradle |6.0 or higher
|IDE |IntelliJ 2018.2 or higher
|==========================

Expand Down
2 changes: 1 addition & 1 deletion src/docTest/groovy/org/gradle/playframework/InDepthUserGuideSamplesIntegrationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import spock.lang.Unroll
*/
@Unroll
class InDepthUserGuideSamplesIntegrationTest extends Specification {
private static final String[] VERSIONS_UNDER_TEST = ["5.1.1", "5.2.1", "5.5.1", "5.6.4", "6.0.1", "6.1.1", "6.3"]
private static final String[] VERSIONS_UNDER_TEST = ["6.0.1", "6.1.1", "6.3"]

@Rule
Sample sample = Sample.from("src/docs/samples")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/gradle/playframework/plugins/PlayDistributionPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private void createDistributionZipTasks(Project project, Distribution distributi
final String capitalizedDistName = capitalizeDistributionName(distribution.getName());
final String stageTaskName = "stage" + capitalizedDistName + "Dist";
final File stageDir = new File(project.getBuildDir(), "stage");
final String baseName = (distribution.getBaseName() != null && "".equals(distribution.getBaseName())) ? distribution.getBaseName() : distribution.getName();
final String baseName = (distribution.getDistributionBaseName().isPresent() && "".equals(distribution.getDistributionBaseName().get())) ? distribution.getDistributionBaseName().get() : distribution.getName();

TaskProvider<Sync> stageSyncTask = project.getTasks().register(stageTaskName, Sync.class, sync -> {
sync.setDescription("Copies the '" + distribution.getName() + "' distribution to a staging directory.");
Expand Down