-
Notifications
You must be signed in to change notification settings - Fork 460
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
Common Spotless Eclipse Framework which can be used by most Spotless … #234
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
3445848
Common Spotless Eclipse Framework which can be used by most Spotless …
fvgh b98af20
Added usage information for fat JARs.
fvgh 353f3c1
Make developers in common java-publish.gradle configurable.
fvgh 5b63850
Enhanced framework interfaces.
fvgh 1fb0609
Refactored directory structure as discussed in #234
fvgh 8a4ecee
Refactored directory structure as discussed in #234
fvgh e4e8fd2
Adpated package names according to previous commit. Applied fixes as …
fvgh 1ecf49b
Moved LINE_DELIMITER to SpotlessEclipseFramework
fvgh 0251a9d
Enhanced error report in case OSGI bundle creation fails.
fvgh 93fee5b
Applied review proposals.
fvgh 8cbbaab
Allow configuration of snapshot repository for upload.
fvgh b9eab72
Added Gradle dependency lock support.
fvgh 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
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,70 @@ | ||
Eclipse Public License - v 1.0 | ||
|
||
THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. | ||
|
||
1. DEFINITIONS | ||
|
||
"Contribution" means: | ||
|
||
a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and | ||
b) in the case of each subsequent Contributor: | ||
i) changes to the Program, and | ||
ii) additions to the Program; | ||
where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. | ||
"Contributor" means any person or entity that distributes the Program. | ||
|
||
"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. | ||
|
||
"Program" means the Contributions distributed in accordance with this Agreement. | ||
|
||
"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. | ||
|
||
2. GRANT OF RIGHTS | ||
|
||
a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. | ||
b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. | ||
c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. | ||
d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. | ||
3. REQUIREMENTS | ||
|
||
A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: | ||
|
||
a) it complies with the terms and conditions of this Agreement; and | ||
b) its license agreement: | ||
i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; | ||
ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; | ||
iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and | ||
iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. | ||
When the Program is made available in source code form: | ||
|
||
a) it must be made available under this Agreement; and | ||
b) a copy of this Agreement must be included with each copy of the Program. | ||
Contributors may not remove or alter any copyright notices contained within the Program. | ||
|
||
Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. | ||
|
||
4. COMMERCIAL DISTRIBUTION | ||
|
||
Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. | ||
|
||
For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. | ||
|
||
5. NO WARRANTY | ||
|
||
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. | ||
|
||
6. DISCLAIMER OF LIABILITY | ||
|
||
EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. | ||
|
||
7. GENERAL | ||
|
||
If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. | ||
|
||
If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. | ||
|
||
All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. | ||
|
||
Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. | ||
|
||
This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. |
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,66 @@ | ||
# spotless-eclipse-base | ||
|
||
Eclipse formatters are embedded in plugins serving multiple purposes and not necessarily supporting headless builds. Hence the plugin interfaces are depending on various Eclipse plugins and services not required for the formatting purpose. | ||
|
||
Spotless provides its own plugin framework with `com.diffplug.spotless.JarState`. This allows Spotless to use different Eclipse versions in parallel. | ||
|
||
|
||
The `com.diffplug.gradle.spotless:spotless-eclipse-base` artifact mocks the redundant Eclipse OSGI/plugin framework for Spotless. Furthermore it provides Eclipse services adapted for Spotless's own use, which avoids for example the creation of a permanent Eclipse workspace and reduces dependencies on Eclipse modules unused by the Eclipse code formatters. | ||
|
||
## Usage | ||
|
||
Include the artifact in your Spotless Eclipse formatter project, where the major version must match the Eclipse core version your formatter supports. The exact default version should be selected by the **lib-extra**. | ||
Minor versions indicate a change in the minimum Eclipse (core/resource) dependencies. | ||
Patch versions are always backward compatible. | ||
|
||
|
||
```Gradle | ||
dependencies { | ||
compile "com.diffplug.spotless:spotless-eclipse-base:3.+" | ||
} | ||
``` | ||
|
||
In the constructor of your formatter, the Spotless Eclipse Framework can be configured depending on your formatter's requirements. For example the JDT formatter can be configured like: | ||
|
||
```Java | ||
public EclipseFormatterStepImpl(Properties settings) throws Exception { | ||
SpotlessEclipseFramework.setup(plugins -> { | ||
plugins.applyDefault(); | ||
plugins.add(new org.eclipse.jdt.core.JavaCore()); | ||
}); | ||
... | ||
``` | ||
|
||
The framework also supports fat JARs, providing multiple plugins. | ||
In this cases the resources required by plugins, especially the `META-INF` and plugin information, must be located in locations unique | ||
to the plugin. | ||
For this purpose the framework expects that these resources are stored in a sub-directory | ||
which has the name of the package containing the plugin. For example in case the JDT plugin | ||
is included in your formatter fat JAR, the directory structure should be: | ||
|
||
``` | ||
+ resources | ||
| | ||
+--+ org.eclipse.jdt.core | ||
| | | ||
| +--+ META-INF | ||
| | | | ||
| | +-- MANIFEST.MF | ||
| | | ||
| +--- plugin.properties | ||
| | | ||
| +--- plugin.xml | ||
|
||
``` | ||
|
||
|
||
## Build | ||
|
||
``` | ||
gradlew -b _ext/eclipse-base/build.gradle publish | ||
``` | ||
|
||
|
||
## License | ||
|
||
Spotless at large is under the Apache 2.0 license, but this jar is under the EPL v1. |
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,30 @@ | ||
apply from: rootProject.file('../gradle/java-setup.gradle') | ||
apply from: rootProject.file('../gradle/java-publish.gradle') | ||
|
||
ext { | ||
developers = [ | ||
fvgh: [ name: 'Frank Vennemeyer', email: 'frankgh@zoho.com' ] | ||
] | ||
} | ||
|
||
dependencies { | ||
compile("org.eclipse.platform:org.eclipse.core.resources:${VER_ECLIPSE_CORE_RESOURCES}") { | ||
exclude group: 'org.eclipse.platform', module: 'org.eclipse.ant.core' | ||
exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.expressions' | ||
exclude group: 'org.eclipse.platform', module: 'org.eclipse.core.filesystem' | ||
} | ||
} | ||
|
||
jar { | ||
manifest { | ||
from 'src/main/resources/META-INF/MANIFEST.MF' | ||
} | ||
} | ||
|
||
////////// | ||
// Test // | ||
////////// | ||
sourceSets { | ||
// Use JAR file with all resources for Eclipse-Base integration-tests | ||
test.runtimeClasspath = jar.outputs.files + sourceSets.test.output + sourceSets.test.compileClasspath | ||
} |
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,15 @@ | ||
# Mayor version correspond to the required Eclipse core version. | ||
# Minor version changes in case the minimum Eclipse core dependencies are raised due to incompatibilities of their internal interfaces. | ||
# Patch version is incremented in case of bug-fixes and evolutions. | ||
ext_version=3.0.0-SNAPSHOT | ||
ext_artifactId=spotless-eclipse-base | ||
ext_description=Eclipse bundle controller and services for Spotless | ||
|
||
ext_org=diffplug | ||
ext_group=com.diffplug.spotless | ||
|
||
# Build requirements | ||
ext_VER_JAVA=1.8 | ||
|
||
# Compile dependencies | ||
VER_ECLIPSE_CORE_RESOURCES=[3.11.0,4.0.0[ | ||
52 changes: 52 additions & 0 deletions
52
...ase/src/main/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseCoreConfig.java
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,52 @@ | ||
/* | ||
* Copyright 2016 DiffPlug | ||
* | ||
* Licensed 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 com.diffplug.spotless.extra.eclipse.base; | ||
|
||
import org.osgi.framework.BundleActivator; | ||
|
||
import com.diffplug.spotless.extra.eclipse.base.SpotlessEclipseFramework.DefaultBundles; | ||
import com.diffplug.spotless.extra.eclipse.base.osgi.BundleConfig; | ||
|
||
/** | ||
* Configuration of core bundles which shall be provided by the | ||
* {@link SpotlessEclipseFramework}. | ||
* <p> | ||
* Core bundles are not accessed via the plugin registry, but by static methods. | ||
* Hence they do not require a registration, which allows a lightweight | ||
* setup. | ||
* </p> | ||
* @see org.eclipse.core.internal.runtime.PlatformActivator | ||
*/ | ||
public class SpotlessEclipseCoreConfig extends BundleConfig<SpotlessEclipseFramework.DefaultBundles> { | ||
|
||
SpotlessEclipseCoreConfig() {} | ||
|
||
@Override | ||
public void applyDefault() { | ||
add(SpotlessEclipseFramework.DefaultBundles.createAll()); | ||
} | ||
|
||
@Override | ||
protected BundleActivator create(DefaultBundles bundle) { | ||
return bundle.create(); | ||
} | ||
|
||
@Override | ||
protected int getDefaultState(DefaultBundles bundle) { | ||
return bundle.getDesiredState(); | ||
} | ||
|
||
} |
Oops, something went wrong.
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.
Is this meant to be
4.0.0]
?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.
No, Eclipse is quite clear that major version changes mean always an incompatibility in interfaces. So I don't expect to support 4.X.
But as I stated in #226, this range is anyhow guess work, since I am not able to use only API calls.
In my opinion, the lib-extra should tie down tested versions, but also give the user the possibility to override these versions (for early adopters).