Skip to content

Commit 9814eb4

Browse files
nedtwiggnedtwigg
committed
move to other computer
1 parent c068ac8 commit 9814eb4

8 files changed

+48
-26
lines changed

‎CHANGES.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Durian releases
22

3-
### Version 0.1 - April 20th 2015 ([jcenter](https://bintray.com/diffplug/opensource/durian/0.1/view))
3+
### Version 1.0 - TBD ([jcenter](https://bintray.com/diffplug/opensource/durian-rx/1.0/view))
44

5-
* First release, to test out that we can release to jcenter and whatnot.
5+
* First stable release

‎CONTRIBUTING.md

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Contributing to Durian
22

3-
Pull requests are welcome, preferably against the branch `develop`, but definitely not against `master`.
3+
Pull requests are welcome, preferably against the branch `develop`, and definitely not against `master`.
44

55
## Build instructions
66

@@ -14,12 +14,8 @@ It's a bog-standard gradle build.
1414
* runs FindBugs
1515
* checks the formatting
1616
* runs the tests
17-
* updates the manifest
1817

19-
If you're getting style warnings:
20-
21-
`gradlew licenseFormat` will apply the license template.
22-
~~`gradlew format` will apply the coding style~~ [Github issue](https://github.com/youribonnaffe/gradle-format-plugin/issues/8).
18+
If you're getting style warnings, `gradlew spotlessApply` will apply anything necessary to fix formatting. For more info on the formatter, check out [spotless](https://github.com/diffplug/spotless).
2319

2420
## License
2521

‎README.md

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
# Durian: [Guava](https://github.com/google/guava)'s spikier (unofficial) cousin
1+
# <img align="left" src="durian.png"> Durian: [Guava](https://github.com/google/guava)'s spikier (unofficial) cousin
22

3-
![durian-logo](durian.png)
4-
[![Release](http://img.shields.io/badge/master-0.1-lightgrey.svg)](https://github.com/diffplug/durian/releases/latest)
5-
[![Build Status](https://travis-ci.org/diffplug/durian.svg?branch=master)](https://travis-ci.org/diffplug/durian)
6-
[![Snapshot](http://img.shields.io/badge/develop-0.2--SNAPSHOT-lightgrey.svg)](https://github.com/diffplug/durian/tree/develop)
7-
[![Build Status](https://travis-ci.org/diffplug/durian.svg?branch=develop)](https://travis-ci.org/diffplug/durian)
3+
[![JCenter artifact](https://img.shields.io/badge/mavenCentral-com.diffplug.durian%3Adurian-blue.svg)](https://bintray.com/diffplug/opensource/durian/view)
4+
[![Branch master](http://img.shields.io/badge/master-2.0-lightgrey.svg)](https://github.com/diffplug/durian/releases/latest)
5+
[![Branch develop](http://img.shields.io/badge/develop-2.1--SNAPSHOT-lightgrey.svg)](https://github.com/diffplug/durian/tree/develop)
6+
[![Branch develop Travis CI](https://travis-ci.org/diffplug/durian.svg?branch=develop)](https://travis-ci.org/diffplug/durian)
87
[![License](https://img.shields.io/badge/license-Apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
98

109
# NOT YET SUITABLE FOR USE - we're releasing a formerly internal library, bear with us as we clean it up for public release
@@ -22,9 +21,6 @@ Durian's only requirement is Java 8 or greater, no other libraries needed (not e
2221

2322
## Known problems
2423

25-
* The `MANIFEST.MF` has a bunch of unneeded `VER_suchandsuch` properties. They don't do any harm, but it would be nice to fix. [Github issue](https://github.com/TomDmitriev/gradle-bundle-plugin/issues/33)
26-
* `gradlew format` is supposed to format the source code. For now, it doesn't work. [Github issue](https://github.com/youribonnaffe/gradle-format-plugin/issues/8)
27-
2824
## Acknowledgements
2925

3026
* Built by [gradle](http://gradle.org/).

‎build.gradle

+38-8
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ sourceCompatibility = VER_JAVA
4343
targetCompatibility = VER_JAVA
4444

4545
dependencies {
46-
compile "com.diffplug.durian-rx:durian-rx:${VER_DURIAN_RX}"
46+
compile "com.diffplug.durian:durian-rx:${VER_DURIAN_RX}"
4747
compile "com.diffplug.durian:durian:${VER_DURIAN}"
4848
compile "com.google.guava:guava:${VER_GUAVA}"
4949
compile "io.reactivex:rxjava:${VER_RXJAVA}"
@@ -89,9 +89,9 @@ tasks.eclipse.dependsOn(cleanEclipse)
8989
apply plugin: 'com.diffplug.gradle.spotless'
9090
spotless {
9191
java {
92-
licenseHeaderFile 'spotless.license.java' // License header file
93-
importOrderFile 'spotless.importorder.properties' // An import ordering file, exported from Eclipse
94-
eclipseFormatFile 'spotless.eclipseformat.xml' // XML file dumped out by the Eclipse formatter
92+
licenseHeaderFile 'spotless.license.java' // License header file
93+
importOrderFile 'spotless.importorder' // An import ordering file, exported from Eclipse
94+
eclipseFormatFile 'spotless.eclipseformat.xml' // XML file dumped out by the Eclipse formatter
9595
// Eclipse formatter puts excess whitespace after lambda blocks
9696
// funcThatTakesLambdas(x -> {} , y -> {} ) // what Eclipse does
9797
// funcThatTakesLambdas(x -> {}, y -> {}) // what I wish Eclipse did
@@ -101,6 +101,7 @@ spotless {
101101
target '**/*.gradle', '**/*.md', '**/.gitignore'
102102
indentWithTabs()
103103
trimTrailingWhitespace()
104+
endWithNewline()
104105
}
105106
}
106107

@@ -124,9 +125,10 @@ tasks.withType(FindBugs) {
124125
html.enabled = true
125126
}
126127
}
127-
// we'll want the findbugs annotations
128+
// we'll want the findbugs annotations (they don't have a 3.0.1 version)
128129
dependencies {
129-
compile "com.google.code.findbugs:annotations:${VER_FINDBUGS}"
130+
compile 'com.google.code.findbugs:annotations:3.0.0'
131+
compile 'com.google.code.findbugs:jsr305:3.0.0'
130132
}
131133

132134
///////////
@@ -158,13 +160,41 @@ publishing {
158160
from components.java
159161
artifact sourcesJar
160162
artifact javadocJar
161-
// don't force our weird p2 ivy/p2 solution on our users
162163
pom.withXml {
164+
// don't force our weird p2 ivy/p2 solution on our users
163165
asNode().dependencies.'*'.each() {
164166
if (it.groupId.text() == 'p2') {
165167
it.parent().remove(it)
166168
}
167169
}
170+
// findbugs annotations should have scope "provided"
171+
asNode().dependencies.'*'.findAll() { it.groupId.text() == 'com.google.code.findbugs' }.each() { it.scope*.value = 'provided' }
172+
// add MavenCentral requirements to the POM
173+
asNode().children().last() + {
174+
resolveStrategy = Closure.DELEGATE_FIRST
175+
name project.name
176+
description project.description
177+
url "https://github.com/${org}/${name}"
178+
scm {
179+
url "https://github.com/${org}/${name}"
180+
connection "scm:git:git://github.com/${org}/${name}"
181+
developerConnection "scm:git:ssh:[email protected]/${org}/${name}"
182+
}
183+
licenses {
184+
license {
185+
name 'The Apache Software License, Version 2.0'
186+
url 'http://www.apache.org/license/LICENSE-2.0.txt'
187+
distribution 'repo'
188+
}
189+
}
190+
developers {
191+
developer {
192+
id 'nedtwigg'
193+
name 'Ned Twigg'
194+
email '[email protected]'
195+
}
196+
}
197+
}
168198
}
169199
}
170200
}
@@ -213,7 +243,7 @@ if (project.hasProperty('dp_bintray_user')) {
213243
if (project.version.endsWith('SNAPSHOT')) {
214244
vcsTag = 'develop'
215245
} else {
216-
vcsTag = 'release/' + project.version
246+
vcsTag = 'v' + project.version
217247
}
218248
}
219249
}

‎durian-swt.png

12 KB
Loading

‎durian.png

-16 KB
Binary file not shown.

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version=1.0-SNAPSHOT
22
name=durian-swt
3-
group=com.diffplug.durian-swt
3+
group=com.diffplug.durian
44
description=Durian SWT - Reactive utilties and fluent builders for SWT
55
org=diffplug
66

‎spotless.importorder.properties renamed to ‎spotless.importorder

File renamed without changes.

0 commit comments

Comments
 (0)