Skip to content
This repository was archived by the owner on Oct 26, 2022. It is now read-only.

Gradle 3.x/4.x compatibility. #112

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Gradle 3.x/4.x compatibility. #112

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
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
task publish

task wrapper(type: Wrapper) {
gradleVersion = '2.0'
distributionUrl = 'https://services.gradle.org/distributions/gradle-2.0-all.zip'
gradleVersion = '4.0'
distributionUrl = 'https://services.gradle.org/distributions/gradle-4.0-all.zip'
}

ext {
Expand All @@ -11,7 +11,7 @@ ext {

allprojects {
apply plugin: 'eclipse'
tasks.eclipse << {
tasks.eclipse.doLast {
File prefs = project.file('.settings/org.eclipse.core.resources.prefs');
if(!prefs.exists()) {
prefs.parentFile.mkdirs()
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
6 changes: 3 additions & 3 deletions gwt-gradle-plugin/src/main/java/de/richsource/gradle/plugins/gwt/GwtEclipsePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ public void execute(GwtWarPlugin warPlugin) {

eclipseModel.getProject().buildCommand(ECLIPSE_BUILDER_WEBAPP_VALIDATOR);

project.getTasks().getByName(EclipsePlugin.getECLIPSE_TASK_NAME()).dependsOn(GwtWarPlugin.TASK_WAR_TEMPLATE);
project.getTasks().getByName(getAssociatedCleanTask(EclipsePlugin.getECLIPSE_TASK_NAME())).dependsOn(getAssociatedCleanTask(GwtWarPlugin.TASK_WAR_TEMPLATE));
project.getTasks().getByName(EclipsePlugin.ECLIPSE_TASK_NAME).dependsOn(GwtWarPlugin.TASK_WAR_TEMPLATE);
project.getTasks().getByName(getAssociatedCleanTask(EclipsePlugin.ECLIPSE_TASK_NAME)).dependsOn(getAssociatedCleanTask(GwtWarPlugin.TASK_WAR_TEMPLATE));

final GdtOptions gdtExtension = ((ExtensionAware)eclipseExtension).getExtensions().create("gdt", GdtOptionsImpl.class);
configureGdtExtension(extension, gdtExtension);
Expand All @@ -74,7 +74,7 @@ public void execute(GwtWarPlugin warPlugin) {

GenerateGdt generateGdt = project.getTasks().create(GENERATE_GDT_TASK, GenerateGdt.class);
generateGdt.setSettingsFile(project.file(".settings/com.google.gdt.eclipse.core.prefs"));
project.getTasks().getByName(EclipsePlugin.getECLIPSE_TASK_NAME()).dependsOn(generateGdt);
project.getTasks().getByName(EclipsePlugin.ECLIPSE_TASK_NAME).dependsOn(generateGdt);

project.afterEvaluate(new Action<Project>() {
@Override
Expand Down
11 changes: 5 additions & 6 deletions gwt-gradle-plugin/src/test/java/de/richsource/gradle/plugins/gwt/GwtPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@
import static org.junit.Assert.*;

import org.gradle.api.Project;
import org.gradle.api.internal.project.AbstractProject;
import org.gradle.api.internal.project.ProjectInternal;
import org.gradle.api.plugins.ExtensionContainer;
import org.gradle.api.plugins.WarPlugin;
import org.gradle.api.tasks.Copy;
import org.gradle.api.tasks.TaskContainer;
import org.gradle.api.tasks.bundling.War;
import org.gradle.plugins.ide.eclipse.EclipsePlugin;
Expand Down Expand Up @@ -68,15 +67,15 @@ public void testBasicTasksAvailable() {
@Test
public void testSuperDevTaskAvailable() {
getExtension().setCodeserver(true);
((AbstractProject)project).evaluate();
((ProjectInternal) project).evaluate();

assertThat(tasks.getByName(GwtBasePlugin.TASK_GWT_SUPER_DEV), instanceOf(GwtSuperDev.class));
}

@Test
public void testSuperDevTaskNotAvailable() {
getExtension().setCodeserver(false);
((AbstractProject)project).evaluate();
((ProjectInternal) project).evaluate();

assertNull(tasks.findByName(GwtBasePlugin.TASK_GWT_SUPER_DEV));
}
Expand All @@ -85,7 +84,7 @@ public void testSuperDevTaskNotAvailable() {
public void testWarTasksAvailable() {
project.getPlugins().apply(WarPlugin.class);

assertThat(tasks.getByName(GwtWarPlugin.TASK_WAR_TEMPLATE), instanceOf(Copy.class));
assertThat(tasks.getByName(GwtWarPlugin.TASK_WAR_TEMPLATE), instanceOf(ExplodedWar.class));
assertThat(tasks.getByName(GwtWarPlugin.TASK_GWT_DEV), instanceOf(GwtDev.class));
assertThat(tasks.getByName(GwtWarPlugin.TASK_DRAFT_WAR), instanceOf(War.class));
}
Expand Down