Skip to content

Commit

Permalink
Merge pull request #1 from aNNiMON/master
Browse files Browse the repository at this point in the history
Merge from master
  • Loading branch information
PromanSEW authored Apr 15, 2018
2 parents e528785 + 4cb67c3 commit bb83c7d
Show file tree
Hide file tree
Showing 82 changed files with 1,083 additions and 271 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ language: java

jdk:
- oraclejdk8
- oraclejdk9

cache:
directories:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,15 @@ Download [latest release](https://github.com/aNNiMON/Lightweight-Stream-API/rele
<dependency>
<groupId>com.annimon</groupId>
<artifactId>stream</artifactId>
<version>1.1.9</version>
<version>1.2.0</version>
</dependency>
```
or Gradle:

```groovy
dependencies {
...
compile 'com.annimon:stream:1.1.9'
implementation 'com.annimon:stream:1.2.0'
...
}
```
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
2 changes: 1 addition & 1 deletion stream/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'java-library'
apply plugin: 'maven'

archivesBaseName = 'stream'
version = '1.1.9-SNAPSHOT'
version = '1.2.0-SNAPSHOT'
group = 'com.annimon'
ext.isReleaseVersion = !version.contains("SNAPSHOT")

Expand Down
4 changes: 2 additions & 2 deletions stream/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.annimon</groupId>
<artifactId>stream</artifactId>
<version>1.1.9</version>
<version>1.2.0</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -33,7 +33,7 @@
<connection>scm:git:[email protected]:aNNiMON/Lightweight-Stream-API.git</connection>
<developerConnection>scm:git:[email protected]:aNNiMON/Lightweight-Stream-API.git</developerConnection>
<url>[email protected]:aNNiMON/Lightweight-Stream-API.git</url>
<tag>v1.1.9</tag>
<tag>v1.2.0</tag>
</scm>

<distributionManagement>
Expand Down
14 changes: 7 additions & 7 deletions stream/src/main/java/com/annimon/stream/Collector.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@

/**
* The Collector of stream data.
*
*
* @param <T> the type of input elements to the reduction operation
* @param <A> the mutable accumulation type of the reduction operation
* @param <R> the result type of the reduction operation
* @see Stream#collect(com.annimon.stream.Collector)
*/
public interface Collector<T, A, R> {

/**
* Function provides new containers.
*
*
* @return {@code Supplier}
*/
Supplier<A> supplier();

/**
* Function folds elements into container.
*
*
* @return {@code BiConsumer}
*/
BiConsumer<A, T> accumulator();

/**
* Function produces result by transforming intermediate type.
*
*
* @return {@code Function}
*/
Function<A, R> finisher();
Expand Down
Loading

0 comments on commit bb83c7d

Please sign in to comment.