Skip to content

Rename Client to GluonFX #46

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

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

Rename Client to GluonFX #46

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 eclipse/com.gluonhq.eclipse.plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>com.gluonhq</groupId>
<artifactId>ide-plugin-templates</artifactId>
<version>2.10.3</version>
<version>2.10.4-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions ...gin/src/main/java/com/gluonhq/eclipse/plugin/wizard/GluonProjectApplicationOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ private void createProjectContents(IProgressMonitor mon, File projectDir) {
parameters.put(ProjectConstants.PARAM_GLUON_DESKTOP_VERSION, ProjectConstants.getDesktopVersion());
parameters.put(ProjectConstants.PARAM_GLUON_MOBILE_VERSION, ProjectConstants.getMobileVersion());
parameters.put(ProjectConstants.PARAM_GLUON_ATTACH_VERSION, ProjectConstants.getAttachVersion());
parameters.put(ProjectConstants.PARAM_GLUON_CLIENT_MAVEN_PLUGIN, ProjectConstants.getClientMavenPluginVersion());
parameters.put(ProjectConstants.PARAM_GLUON_CLIENT_GRADLE_PLUGIN, ProjectConstants.getClientGradlePluginVersion());
parameters.put(ProjectConstants.PARAM_GLUONFX_MAVEN_PLUGIN, ProjectConstants.getGluonFXMavenPluginVersion());
parameters.put(ProjectConstants.PARAM_GLUONFX_GRADLE_PLUGIN, ProjectConstants.getGluonFXGradlePluginVersion());
parameters.put(ProjectConstants.PARAM_GLUON_GLISTEN_AFTERBURNER_VERSION, ProjectConstants.getGlistenAfterburnerVersion());

List<File> filesToOpen = new ArrayList<>();
Expand Down
4 changes: 2 additions & 2 deletions intellij/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }

repositories {
mavenLocal()
jcenter()
mavenCentral()
maven {
url 'https://nexus.gluonhq.com/nexus/content/repositories/releases'
}
}

dependencies {
compile 'com.gluonhq:ide-plugin-templates:2.10.3'
compile 'com.gluonhq:ide-plugin-templates:2.10.4-SNAPSHOT'
}


Expand Down
4 changes: 2 additions & 2 deletions intellij/src/main/java/com/gluonhq/plugin/intellij/module/GluonTemplateModuleBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ private void createProject(final Project project) {
parameters.put(ProjectConstants.PARAM_GLUON_DESKTOP_VERSION, ProjectConstants.getDesktopVersion());
parameters.put(ProjectConstants.PARAM_GLUON_MOBILE_VERSION, ProjectConstants.getMobileVersion());
parameters.put(ProjectConstants.PARAM_GLUON_ATTACH_VERSION, ProjectConstants.getAttachVersion());
parameters.put(ProjectConstants.PARAM_GLUON_CLIENT_MAVEN_PLUGIN, ProjectConstants.getClientMavenPluginVersion());
parameters.put(ProjectConstants.PARAM_GLUON_CLIENT_GRADLE_PLUGIN, ProjectConstants.getClientGradlePluginVersion());
parameters.put(ProjectConstants.PARAM_GLUONFX_MAVEN_PLUGIN, ProjectConstants.getGluonFXMavenPluginVersion());
parameters.put(ProjectConstants.PARAM_GLUONFX_GRADLE_PLUGIN, ProjectConstants.getGluonFXGradlePluginVersion());
parameters.put(ProjectConstants.PARAM_GLUON_GLISTEN_AFTERBURNER_VERSION, ProjectConstants.getGlistenAfterburnerVersion());

final File projectRoot = new File(project.getBasePath());
Expand Down
2 changes: 1 addition & 1 deletion netbeans/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ dependencies {
providedCompile netbeansApi('org-openide-util-lookup')
providedCompile files(findToolsJar(javaVersion))

compile 'com.gluonhq:ide-plugin-templates:2.10.3'
compile 'com.gluonhq:ide-plugin-templates:2.10.4-SNAPSHOT'
compile 'org.apache.logging.log4j:log4j-1.2-api:2.5'
}

Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/gluonhq/plugin/netbeans/template/iterators/GluonBaseWizardIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ public void initialize(WizardDescriptor wiz) {
wiz.putProperty(ProjectConstants.PARAM_GLUON_DESKTOP_VERSION, ProjectConstants.getDesktopVersion());
wiz.putProperty(ProjectConstants.PARAM_GLUON_MOBILE_VERSION, ProjectConstants.getMobileVersion());
wiz.putProperty(ProjectConstants.PARAM_GLUON_ATTACH_VERSION, ProjectConstants.getAttachVersion());
wiz.putProperty(ProjectConstants.PARAM_GLUON_CLIENT_MAVEN_PLUGIN, ProjectConstants.getClientMavenPluginVersion());
wiz.putProperty(ProjectConstants.PARAM_GLUON_CLIENT_GRADLE_PLUGIN, ProjectConstants.getClientGradlePluginVersion());
wiz.putProperty(ProjectConstants.PARAM_GLUONFX_MAVEN_PLUGIN, ProjectConstants.getGluonFXMavenPluginVersion());
wiz.putProperty(ProjectConstants.PARAM_GLUONFX_GRADLE_PLUGIN, ProjectConstants.getGluonFXGradlePluginVersion());
wiz.putProperty(ProjectConstants.PARAM_GLUON_GLISTEN_AFTERBURNER_VERSION, ProjectConstants.getGlistenAfterburnerVersion());

handle.start();
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/gluonhq/plugin/netbeans/template/iterators/GluonDesktopMultiWizardIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected WizardDescriptor.Panel[] createPanels() {

@Override
protected String[] createSteps() {
if (!OptInHelper.alreadyOptedIn()) {
if (!OptInHelper.alreadyOptedIn()) {
return new String[]{
NbBundle.getMessage(GluonUserOptInPanel.class, "LBL_UserOptIn"),
NbBundle.getMessage(GluonUserOptInPanel.class, "LBL_CreateProjectStep"),
Expand Down