Skip to content

Commit 1926eae

Browse files
nedtwiggnedtwigg
authored
Merge pull request #2 from diffplug/feat/gradle-6
Feat/gradle 6
2 parents dae0f94 + 929360d commit 1926eae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+278
-486
lines changed

‎CHANGES.md‎

Lines changed: 25 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,66 @@
11
# DurianRx releases
22

3-
### Version 3.1.0-SNAPSHOT - TBD ([javadoc](http://diffplug.github.io/durian-rx/javadoc/snapshot/) [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/durian/durian-rx/))
4-
5-
### Version 3.0.1 - November 12th 2019 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/3.0.1/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/3.0.1/view))
3+
## [Unreleased]
64

5+
## [3.0.1] - 2019-11-12
76
* RxExecutor is now more consistent about failure - if the `onSuccess` throws an exception, it will always be passed to the `onFailure` handler as a `CompletionException`.
87

9-
### Version 3.0.0 - August 1st 2018 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/3.0.0/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/3.0.0/view))
10-
8+
## [3.0.0] - 2018-08-01
119
* `DisposableEar`'s final name is `Chit`.
1210
* Added `Rx.sync(RxBox<T> a, RxBox<T> b)`.
1311
* Added `MultiSelectModel` for a UI-independent multi-selection model.
1412

15-
### Version 3.0.0.BETA2 - March 8th 2017 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/3.0.0.BETA2/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/3.0.0.BETA2/view))
16-
13+
## [3.0.0.BETA2] - 2017-03-08
1714
* Got rid of the `RxListener.IsLogging` marker interface.
1815
* Made `RxListener.isLogging()` public, and added `RxListener.onErrorDontLog(Throwable)`.
19-
+ Combined, these methods make it possible for an external framework to detect and hijack logging for a specific listener.
20-
+ Used by the Agent framework in DiffPlug 2+
16+
+ Combined, these methods make it possible for an external framework to detect and hijack logging for a specific listener.
17+
+ Used by the Agent framework in DiffPlug 2+
2118
* Added `CasBox.getAndSet()`.
2219
* `DispoableEar.Settable` now allows `dispose()` to be called multiple times, to comply with the `Disposable` contract.
2320
* An `RxJavaCompat` layer for turning `Single` and `Maybe` into `CompletionStage`.
2421

25-
### Version 3.0.0.BETA - February 7th 2017 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/3.0.0.BETA/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/3.0.0.BETA/view))
26-
22+
## [3.0.0.BETA] - 2017-02-07
2723
* Added `DisposableEar` and `GuardedExecutor`.
2824
* Fixed a bug in `ForwardingBox.modify()`.
2925
* `RxExecutor` now exposes the underlying `Executor`, `Scheduler`, and `RxTracingPolicy`.
3026

31-
### Version 3.0.0.ALPHA - November 11th 2016 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/3.0.0.ALPHA/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/3.0.0.ALPHA/view))
32-
27+
## [3.0.0.ALPHA] - 2016-11-11
3328
* Bumped RxJava to 2.0, and incorporated `RxTracingPolicy` into `RxJavaPlugins`.
3429
* Fixed a bug in `ForwardingBox.modify()`.
3530
* `RxExecutor` now exposes the underlying `Executor`, `Scheduler`, and `RxTracingPolicy`.
3631

37-
### Version 2.0.0 - July 13th 2016 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/2.0.0/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/2.0.0/view))
38-
32+
## [2.0.0] - 2016-07-13
3933
* `Immutables` has moved to `com.diffplug.durian:durian-collect`.
4034
* Removed collections-specific classes.
41-
+ `RxOptional` -> `RxBox<Optional>`
42-
+ `RxSet` -> `RxBox<ImmutableSet>`
43-
+ This makes it possible to mix-and-match RxBox implementations and collection implementations.
35+
+ `RxOptional` -> `RxBox<Optional>`
36+
+ `RxSet` -> `RxBox<ImmutableSet>`
37+
+ This makes it possible to mix-and-match RxBox implementations and collection implementations.
4438
* `Box` and `RxBox` had poorly defined behavior around race conditions. It is now implemented by the following well-defined classes:
45-
+ `RxBox.of(initialValue)` makes no atomicity guarantees.
46-
+ `CasBox` supports compare-and-swap atomic modifications.
47-
+ `LockBox` supports mutex-based atomic modifications.
48-
+ `RxLockBox` supports mutex-based atomic modification with RxJava-based notifications.
39+
+ `RxBox.of(initialValue)` makes no atomicity guarantees.
40+
+ `CasBox` supports compare-and-swap atomic modifications.
41+
+ `LockBox` supports mutex-based atomic modifications.
42+
+ `RxLockBox` supports mutex-based atomic modification with RxJava-based notifications.
4943
* Broke the overly crowded `Rx` class into serveral pieces:
50-
+ `Rx` is now only a collection of utility methods.
51-
+ `RxListener` is now the listener interface for `Observer<T> & FutureCallback<T>`.
52-
+ `Rx.RxExecutor` is now `RxExecutor`, and `Rx.HasRxExecutor` is `RxExecutor.Has`.
53-
+ `RxGetter` no longer enforces `distinctUntilChanged`.
44+
+ `Rx` is now only a collection of utility methods.
45+
+ `RxListener` is now the listener interface for `Observer<T> & FutureCallback<T>`.
46+
+ `Rx.RxExecutor` is now `RxExecutor`, and `Rx.HasRxExecutor` is `RxExecutor.Has`.
47+
+ `RxGetter` no longer enforces `distinctUntilChanged`.
5448
* Adopted Durian and its new `ConverterNonNull`.
5549
* Added `OrderedLock`, which takes multiple locks in a guaranteed lock-free way.
5650
* Added `Breaker`, for temporarily breaking a connection between observable values.
5751

58-
### Version 1.3.0 - February 9th 2016 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/1.3.0/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/1.3.0/view))
59-
52+
## [1.3.0] - 2016-02-09
6053
* Ditched Guava for DurianGuava.
6154

62-
### Version 1.2.0 - November 18th 2015 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/1.2.0/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/1.2.0/view))
63-
55+
## [1.2.0] - 2015-11-18
6456
* Added support for `CompletionStage` (and therefore `CompletableFuture`), with the same behavior as `ListenableFuture`.
6557

66-
### Version 1.1.0 - October 19th 2015 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/1.1.0/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/1.1.0/view))
67-
58+
## [1.1.0] - 2015-10-19
6859
* Changed OSGi metadata Bundle-SymbolicName to `com.diffplug.durian.rx`.
6960
* OSGi metadata is now auto-generated using bnd.
7061

71-
### Version 1.0.1 - July 27th 2015 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/1.0.1/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/1.0.1/view))
72-
62+
## [1.0.1] - 2015-07-27
7363
* Gah! MANIFEST.MF still had -SNAPSHOT version. Fixed now. Would be really nice if we could get MANIFEST.MF generation working.
7464

75-
### Version 1.0 - May 13th 2015 ([javadoc](http://diffplug.github.io/durian-rx/javadoc/1.0/), [jcenter](https://bintray.com/diffplug/opensource/durian-rx/1.0/view))
76-
65+
## [1.0] - 2015-05-13
7766
* First stable release.

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Contributing to Durian
22

33
Pull requests are welcome, preferably against `master`.
4-
5-
Every successful Travis CI build on branch `master` is automatically published to [`https://oss.sonatype.org/content/repositories/snapshots`](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/), and its javadoc are published [here](http://diffplug.github.io/durian-rx/javadoc/snapshot/).
6-
74
## Build instructions
85

96
It's a bog-standard gradle build.
@@ -26,13 +23,13 @@ By contributing your code, you agree to license your contribution under the term
2623
All files are released with the Apache 2.0 license as such:
2724

2825
```
29-
Copyright 2015 DiffPlug
26+
Copyright 2020 DiffPlug
3027
3128
Licensed under the Apache License, Version 2.0 (the "License");
3229
you may not use this file except in compliance with the License.
3330
You may obtain a copy of the License at
3431
35-
http://www.apache.org/licenses/LICENSE-2.0
32+
https://www.apache.org/licenses/LICENSE-2.0
3633
3734
Unless required by applicable law or agreed to in writing, software
3835
distributed under the License is distributed on an "AS IS" BASIS,

‎README.md‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,26 @@
22

33
<!---freshmark shields
44
output = [
5-
link(shield('Maven artifact', 'mavenCentral', '{{group}}:{{name}}', 'blue'), 'https://bintray.com/{{org}}/opensource/{{name}}/view'),
6-
link(shield('Latest version', 'latest', '{{stable}}', 'blue'), 'https://github.com/{{org}}/{{name}}/releases/latest'),
7-
link(shield('Javadoc', 'javadoc', 'OK', 'blue'), 'https://javadoc.io/doc/com.diffplug.durian/durian-rx/{{stable}}/'),
8-
link(shield('License Apache', 'license', 'Apache', 'blue'), 'https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)'),
9-
'',
10-
link(shield('Changelog', 'changelog', '{{version}}', 'brightgreen'), 'CHANGES.md'),
11-
link(image('Travis CI', 'https://travis-ci.org/{{org}}/{{name}}.svg?branch=master'), 'https://travis-ci.org/{{org}}/{{name}}'),
12-
link(shield('Live chat', 'gitter', 'live chat', 'brightgreen'), 'https://gitter.im/diffplug/durian')
13-
].join('\n');
5+
link(shield('Maven central', 'mavencentral', 'com.diffplug.durian:durian-rx', 'blue'), 'https://search.maven.org/artifact/com.diffplug.durian/durian-rx'),
6+
link(shield('Apache 2.0', 'license', 'apache-2.0', 'blue'), 'https://tldrlegal.com/license/apache-license-2.0-(apache-2.0)'),
7+
'',
8+
link(shield('Changelog', 'changelog', versionLast, 'brightgreen'), 'CHANGES.md'),
9+
link(shield('Javadoc', 'javadoc', 'yes', 'brightgreen'), 'https://javadoc.io/doc/com.diffplug.durian/durian-rx/{{versionLast}}/'),
10+
link(shield('Live chat', 'gitter', 'chat', 'brightgreen'), 'https://gitter.im/diffplug/durian'),
11+
link(image('JitCI', 'https://jitci.com/gh/diffplug/durian-rx/svg'), 'https://jitci.com/gh/diffplug/durian-rx')
12+
].join('\n');
1413
-->
15-
[![Maven artifact](https://img.shields.io/badge/mavenCentral-com.diffplug.durian%3Adurian--rx-blue.svg)](https://bintray.com/diffplug/opensource/durian-rx/view)
16-
[![Latest version](https://img.shields.io/badge/latest-3.0.1-blue.svg)](https://github.com/diffplug/durian-rx/releases/latest)
17-
[![Javadoc](https://img.shields.io/badge/javadoc-OK-blue.svg)](https://javadoc.io/doc/com.diffplug.durian/durian-rx/3.0.1/)
18-
[![License Apache](https://img.shields.io/badge/license-Apache-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
14+
[![Maven central](https://img.shields.io/badge/mavencentral-com.diffplug.durian%3Adurian--rx-blue.svg)](https://search.maven.org/artifact/com.diffplug.durian/durian-rx)
15+
[![Apache 2.0](https://img.shields.io/badge/license-apache--2.0-blue.svg)](https://tldrlegal.com/license/apache-license-2.0-(apache-2.0))
1916

2017
[![Changelog](https://img.shields.io/badge/changelog-3.0.1-brightgreen.svg)](CHANGES.md)
21-
[![Travis CI](https://travis-ci.org/diffplug/durian-rx.svg?branch=master)](https://travis-ci.org/diffplug/durian-rx)
22-
[![Live chat](https://img.shields.io/badge/gitter-live_chat-brightgreen.svg)](https://gitter.im/diffplug/durian)
18+
[![Javadoc](https://img.shields.io/badge/javadoc-yes-brightgreen.svg)](https://javadoc.io/doc/com.diffplug.durian/durian-rx/3.0.1/)
19+
[![Live chat](https://img.shields.io/badge/gitter-chat-brightgreen.svg)](https://gitter.im/diffplug/durian)
20+
[![JitCI](https://jitci.com/gh/diffplug/durian-rx/svg)](https://jitci.com/gh/diffplug/durian-rx)
2321
<!---freshmark /shields -->
2422

2523
<!---freshmark javadoc
26-
output = prefixDelimiterReplace(input, 'https://javadoc.io/doc/com.diffplug.durian/durian-rx/', '/', stable);
24+
output = prefixDelimiterReplace(input, 'https://javadoc.io/static/com.diffplug.durian/durian-rx/', '/', versionLast);
2725
-->
2826
DurianRx unifies RxJava's [Observable](http://reactivex.io/documentation/observable.html) with Guava's [ListenableFuture](https://code.google.com/p/guava-libraries/wiki/ListenableFutureExplained). If you happen to be using SWT as a widget toolkit, then you'll want to look at [DurianSwt](https://github.com/diffplug/durian-swt) as well.
2927

0 commit comments

Comments
 (0)