You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2019/03/13 16:20:52 UTC
[incubator-netbeans] branch master updated: [NETBEANS-1976] Play
fair with Atilla's Gradle Plugin (#1161)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c6eb7aa [NETBEANS-1976] Play fair with Atilla's Gradle Plugin (#1161)
c6eb7aa is described below
commit c6eb7aa76370f9a059736b686ba2b1f5f622e87c
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Wed Mar 13 09:20:46 2019 -0700
[NETBEANS-1976] Play fair with Atilla's Gradle Plugin (#1161)
* [NETBEANS-1976] Updated the Gradle Support install instructions.
* [NETBEANS-1976] Added a separate kit for Groovy and Gradle feature
---
ergonomics/ide.ergonomics/groovy.properties | 2 +-
groovy/gradle/manifest.mf | 1 -
.../src/org/netbeans/modules/gradle/Installer.java | 45 ---------------------
groovy/groovy.and.gradle.kit/build.xml | 26 ++++++++++++
groovy/groovy.and.gradle.kit/manifest.mf | 5 +++
.../nbproject/project.properties | 10 +++--
groovy/groovy.and.gradle.kit/nbproject/project.xml | 46 ++++++++++++++++++++++
.../groovy/and/gradle/kit/Bundle.properties | 10 +++--
groovy/groovy.kit/nbproject/project.xml | 6 ---
nbbuild/cluster.properties | 3 +-
10 files changed, 93 insertions(+), 61 deletions(-)
diff --git a/ergonomics/ide.ergonomics/groovy.properties b/ergonomics/ide.ergonomics/groovy.properties
index b39a6a2..c9a6f12 100644
--- a/ergonomics/ide.ergonomics/groovy.properties
+++ b/ergonomics/ide.ergonomics/groovy.properties
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-mainModule=org.netbeans.modules.groovy.kit
+mainModule=org.netbeans.modules.groovy.and.gradle.kit
project.xpath.nbproject/project.xml=project/configuration/buildExtensions/extension[@id='groovy']
project.file.build.gradle=org.netbeans.modules.gradle.NbGradleProjectFactory
diff --git a/groovy/gradle/manifest.mf b/groovy/gradle/manifest.mf
index fab58a4..d52926a 100644
--- a/groovy/gradle/manifest.mf
+++ b/groovy/gradle/manifest.mf
@@ -1,7 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle
-OpenIDE-Module-Install: org/netbeans/modules/gradle/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
OpenIDE-Module-Specification-Version: 1.1
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/Installer.java b/groovy/gradle/src/org/netbeans/modules/gradle/Installer.java
deleted file mode 100644
index d1a938a..0000000
--- a/groovy/gradle/src/org/netbeans/modules/gradle/Installer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.netbeans.modules.gradle;
-
-import org.openide.modules.ModuleInfo;
-import org.openide.modules.ModuleInstall;
-import org.openide.modules.Modules;
-import org.openide.util.NbBundle.Messages;
-
-public final class Installer extends ModuleInstall {
-
- private static final String CONFLICTING_PROJECT = "org.netbeans.gradle.project";
-
- @Override
- @Messages(
- "MSG_MODULE_CONFLICT=Gradle Projects module conflicts with the Gradle Support module.\n"
- + "In order to be able to activate the Gradle Project module (and modules depending on that):\n"
- + "Please go to Tools > Plugins > Installed, search for Gradle Support, disable the plugin\n"
- + "then restart NetBeans and enable Gradle Projects plugin."
- )
- public void validate() throws IllegalStateException {
- ModuleInfo module = Modules.getDefault().findCodeNameBase(CONFLICTING_PROJECT);
- if ((module != null) && module.isEnabled()) {
- throw new IllegalStateException(Bundle.MSG_MODULE_CONFLICT());
- }
- }
-
-}
diff --git a/groovy/groovy.and.gradle.kit/build.xml b/groovy/groovy.and.gradle.kit/build.xml
new file mode 100644
index 0000000..362180e
--- /dev/null
+++ b/groovy/groovy.and.gradle.kit/build.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project basedir="." default="build" name="groovy/groovy.and.gradle.kit">
+ <description>Builds, tests, and runs the project org.netbeans.modules.groovy.kit</description>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+
+</project>
diff --git a/groovy/groovy.and.gradle.kit/manifest.mf b/groovy/groovy.and.gradle.kit/manifest.mf
new file mode 100644
index 0000000..df87198
--- /dev/null
+++ b/groovy/groovy.and.gradle.kit/manifest.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.modules.groovy.and.gradle.kit
+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/and/gradle/kit/Bundle.properties
+OpenIDE-Module-Specification-Version: 1.1
+
diff --git a/ergonomics/ide.ergonomics/groovy.properties b/groovy/groovy.and.gradle.kit/nbproject/project.properties
similarity index 77%
copy from ergonomics/ide.ergonomics/groovy.properties
copy to groovy/groovy.and.gradle.kit/nbproject/project.properties
index b39a6a2..741e205 100644
--- a/ergonomics/ide.ergonomics/groovy.properties
+++ b/groovy/groovy.and.gradle.kit/nbproject/project.properties
@@ -14,7 +14,11 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
-mainModule=org.netbeans.modules.groovy.kit
-project.xpath.nbproject/project.xml=project/configuration/buildExtensions/extension[@id='groovy']
-project.file.build.gradle=org.netbeans.modules.gradle.NbGradleProjectFactory
+nbm.homepage=http://wiki.netbeans.org/groovy
+nbm.module.author=Martin Adamek, Petr Hejl, Martin Janicek, Matthias Schmidt
+
+test.config.stable.includes=\
+ **/*Test.class
diff --git a/groovy/groovy.and.gradle.kit/nbproject/project.xml b/groovy/groovy.and.gradle.kit/nbproject/project.xml
new file mode 100644
index 0000000..db482e4
--- /dev/null
+++ b/groovy/groovy.and.gradle.kit/nbproject/project.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+ <code-name-base>org.netbeans.modules.groovy.and.gradle.kit</code-name-base>
+ <module-dependencies>
+ <dependency>
+ <code-name-base>org.netbeans.modules.groovy.kit</code-name-base>
+ <run-dependency>
+ <specification-version>1.36</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.gradle.kit</code-name-base>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ </module-dependencies>
+ <test-dependencies>
+ </test-dependencies>
+ <public-packages/>
+ </data>
+ </configuration>
+</project>
diff --git a/ergonomics/ide.ergonomics/groovy.properties b/groovy/groovy.and.gradle.kit/src/org/netbeans/modules/groovy/and/gradle/kit/Bundle.properties
similarity index 69%
copy from ergonomics/ide.ergonomics/groovy.properties
copy to groovy/groovy.and.gradle.kit/src/org/netbeans/modules/groovy/and/gradle/kit/Bundle.properties
index b39a6a2..d5dc5f5 100644
--- a/ergonomics/ide.ergonomics/groovy.properties
+++ b/groovy/groovy.and.gradle.kit/src/org/netbeans/modules/groovy/and/gradle/kit/Bundle.properties
@@ -14,7 +14,9 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-mainModule=org.netbeans.modules.groovy.kit
-project.xpath.nbproject/project.xml=project/configuration/buildExtensions/extension[@id='groovy']
-project.file.build.gradle=org.netbeans.modules.gradle.NbGradleProjectFactory
+OpenIDE-Module-Display-Category=Groovy
+OpenIDE-Module-Long-Description=\
+ This module provides all Groovy and Gradle functionality available in NetBeans. \
+ This module is wrapper for Groovy and Gradle features.
+OpenIDE-Module-Name=Groovy and Gradle
+OpenIDE-Module-Short-Description=Wrapper module for all Groovy and Gradle functionality
diff --git a/groovy/groovy.kit/nbproject/project.xml b/groovy/groovy.kit/nbproject/project.xml
index af689d5..437eeed 100644
--- a/groovy/groovy.kit/nbproject/project.xml
+++ b/groovy/groovy.kit/nbproject/project.xml
@@ -69,12 +69,6 @@
</run-dependency>
</dependency>
<dependency>
- <code-name-base>org.netbeans.modules.gradle.kit</code-name-base>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
<code-name-base>org.netbeans.modules.libs.groovy</code-name-base>
<run-dependency>
<specification-version>1.0</specification-version>
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 088374a..d54207c 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -170,7 +170,7 @@ clusters.list=\
${clusters.config.full.list}
# Bootstrap 'cluster' serves just to group modules which are needed to process
-# module-auto-deps.xml during compilation; other clusters can then benefit
+# module-auto-deps.xml during compilation; other clusters can then benefit
# from autodeps during compilation
nb.cluster.bootstrap.dir=platform
nb.cluster.bootstrap.depends=
@@ -979,6 +979,7 @@ nb.cluster.groovy=\
gradle.persistence,\
gradle.spring,\
gradle.test,\
+ groovy.and.gradle.kit,\
groovy.antproject,\
groovy.editor,\
groovy.gsp,\
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists