From 0d9d6587a8214fba2b8b6e440aa852d13c8c8e2c Mon Sep 17 00:00:00 2001 From: jnape Date: Sun, 14 Jan 2018 19:21:47 -0600 Subject: [PATCH 1/4] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d8c05dbd7..1fb2e8054 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ lambda - 2.1.0 + 2.1.1-SNAPSHOT jar Lambda From d1b7a3a50a7ee3a3dbdc3554c0c31b4e71eb677e Mon Sep 17 00:00:00 2001 From: jnape Date: Sun, 14 Jan 2018 19:26:16 -0600 Subject: [PATCH 2/4] Updating README and CHANGELOG to new version --- CHANGELOG.md | 5 ++++- README.md | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8377d1551..5e300e274 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/). ## [Unreleased] + +## [2.1.0] - 2018-01-14 ### Changed - ***Breaking Change***: `CollectionLens#asSet` is now lawful and preserves new incoming values in the update set - ***Breaking Change***: `IterableLens#head` is now a `Lens.Simple, Maybe>` and is lawful @@ -250,7 +252,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). - `Monadic/Dyadic/TriadicFunction`, `Predicate`, `Tuple2`, `Tuple3` - `Functor`, `BiFunctor`, `ProFunctor` -[Unreleased]: https://github.com/palatable/lambda/compare/lambda-2.0.0...HEAD +[Unreleased]: https://github.com/palatable/lambda/compare/lambda-2.1.0...HEAD +[2.1.0]: https://github.com/palatable/lambda/compare/lambda-2.0.0...lambda-2.1.0 [2.0.0]: https://github.com/palatable/lambda/compare/lambda-1.6.3...lambda-2.0.0 [1.6.3]: https://github.com/palatable/lambda/compare/lambda-1.6.2...lambda-1.6.3 [1.6.2]: https://github.com/palatable/lambda/compare/lambda-1.6.1...lambda-1.6.2 diff --git a/README.md b/README.md index 191c4af42..4ff8f81e0 100644 --- a/README.md +++ b/README.md @@ -57,14 +57,14 @@ Add the following dependency to your: com.jnape.palatable lambda - 2.0.0 + 2.1.0 ``` `build.gradle` ([Gradle](https://docs.gradle.org/current/userguide/dependency_management.html)): ```gradle -compile group: 'com.jnape.palatable', name: 'lambda', version: '2.0.0' +compile group: 'com.jnape.palatable', name: 'lambda', version: '2.1.0' ``` Examples From 19b81188e1de2b11fdd814cef58fe7ed6be49e1c Mon Sep 17 00:00:00 2001 From: jnape Date: Tue, 16 Jan 2018 17:58:49 -0600 Subject: [PATCH 3/4] Moving Trampoline and RecursiveResult to better package --- CHANGELOG.md | 2 ++ .../lambda/functions/recursion}/RecursiveResult.java | 2 +- .../lambda/functions/recursion}/Trampoline.java | 6 +++--- .../lambda/functions/recursion}/RecursiveResultTest.java | 7 ++++--- .../lambda/functions/recursion}/TrampolineTest.java | 9 +++++---- 5 files changed, 15 insertions(+), 11 deletions(-) rename src/main/java/{spike => com/jnape/palatable/lambda/functions/recursion}/RecursiveResult.java (98%) rename src/main/java/{spike => com/jnape/palatable/lambda/functions/recursion}/Trampoline.java (89%) rename src/test/java/{spike => com/jnape/palatable/lambda/functions/recursion}/RecursiveResultTest.java (70%) rename src/test/java/{spike => com/jnape/palatable/lambda/functions/recursion}/TrampolineTest.java (71%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e300e274..60491f794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/). ## [Unreleased] +### Changed +- ***Breaking Change***: Moved `Trampoline` and `RecursiveResult` to better package ## [2.1.0] - 2018-01-14 ### Changed diff --git a/src/main/java/spike/RecursiveResult.java b/src/main/java/com/jnape/palatable/lambda/functions/recursion/RecursiveResult.java similarity index 98% rename from src/main/java/spike/RecursiveResult.java rename to src/main/java/com/jnape/palatable/lambda/functions/recursion/RecursiveResult.java index c33c1afaa..2d3bdbf53 100644 --- a/src/main/java/spike/RecursiveResult.java +++ b/src/main/java/com/jnape/palatable/lambda/functions/recursion/RecursiveResult.java @@ -1,4 +1,4 @@ -package spike; +package com.jnape.palatable.lambda.functions.recursion; import com.jnape.palatable.lambda.adt.coproduct.CoProduct2; import com.jnape.palatable.lambda.functor.Applicative; diff --git a/src/main/java/spike/Trampoline.java b/src/main/java/com/jnape/palatable/lambda/functions/recursion/Trampoline.java similarity index 89% rename from src/main/java/spike/Trampoline.java rename to src/main/java/com/jnape/palatable/lambda/functions/recursion/Trampoline.java index e6eadb4ad..a4efb94cc 100644 --- a/src/main/java/spike/Trampoline.java +++ b/src/main/java/com/jnape/palatable/lambda/functions/recursion/Trampoline.java @@ -1,11 +1,11 @@ -package spike; +package com.jnape.palatable.lambda.functions.recursion; import com.jnape.palatable.lambda.adt.coproduct.CoProduct2; import com.jnape.palatable.lambda.functions.Fn1; import com.jnape.palatable.lambda.functions.Fn2; import com.jnape.palatable.lambda.functions.builtin.fn2.Unfoldr; -import spike.RecursiveResult.Recurse; -import spike.RecursiveResult.Terminate; +import com.jnape.palatable.lambda.functions.recursion.RecursiveResult.Recurse; +import com.jnape.palatable.lambda.functions.recursion.RecursiveResult.Terminate; import java.util.function.Function; diff --git a/src/test/java/spike/RecursiveResultTest.java b/src/test/java/com/jnape/palatable/lambda/functions/recursion/RecursiveResultTest.java similarity index 70% rename from src/test/java/spike/RecursiveResultTest.java rename to src/test/java/com/jnape/palatable/lambda/functions/recursion/RecursiveResultTest.java index 3a7a76e7e..49b086466 100644 --- a/src/test/java/spike/RecursiveResultTest.java +++ b/src/test/java/com/jnape/palatable/lambda/functions/recursion/RecursiveResultTest.java @@ -1,5 +1,6 @@ -package spike; +package com.jnape.palatable.lambda.functions.recursion; +import com.jnape.palatable.lambda.functions.recursion.RecursiveResult; import com.jnape.palatable.traitor.annotations.TestTraits; import com.jnape.palatable.traitor.framework.Subjects; import com.jnape.palatable.traitor.runners.Traits; @@ -10,8 +11,8 @@ import testsupport.traits.TraversableLaws; import static com.jnape.palatable.traitor.framework.Subjects.subjects; -import static spike.RecursiveResult.recurse; -import static spike.RecursiveResult.terminate; +import static com.jnape.palatable.lambda.functions.recursion.RecursiveResult.recurse; +import static com.jnape.palatable.lambda.functions.recursion.RecursiveResult.terminate; @RunWith(Traits.class) public class RecursiveResultTest { diff --git a/src/test/java/spike/TrampolineTest.java b/src/test/java/com/jnape/palatable/lambda/functions/recursion/TrampolineTest.java similarity index 71% rename from src/test/java/spike/TrampolineTest.java rename to src/test/java/com/jnape/palatable/lambda/functions/recursion/TrampolineTest.java index bf8d0612e..9aa9db414 100644 --- a/src/test/java/spike/TrampolineTest.java +++ b/src/test/java/com/jnape/palatable/lambda/functions/recursion/TrampolineTest.java @@ -1,6 +1,7 @@ -package spike; +package com.jnape.palatable.lambda.functions.recursion; import com.jnape.palatable.lambda.adt.hlist.Tuple2; +import com.jnape.palatable.lambda.functions.recursion.RecursiveResult; import org.junit.Test; import java.math.BigInteger; @@ -10,9 +11,9 @@ import static com.jnape.palatable.lambda.functions.builtin.fn2.Into.into; import static java.math.BigInteger.ONE; import static org.junit.Assert.assertEquals; -import static spike.RecursiveResult.recurse; -import static spike.RecursiveResult.terminate; -import static spike.Trampoline.trampoline; +import static com.jnape.palatable.lambda.functions.recursion.RecursiveResult.recurse; +import static com.jnape.palatable.lambda.functions.recursion.RecursiveResult.terminate; +import static com.jnape.palatable.lambda.functions.recursion.Trampoline.trampoline; public class TrampolineTest { From 9bdcd82a05da8530e37101163217d1382c67e6a6 Mon Sep 17 00:00:00 2001 From: jnape Date: Tue, 16 Jan 2018 23:07:51 -0600 Subject: [PATCH 4/4] [maven-release-plugin] prepare release lambda-2.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fb2e8054..94b3a6847 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ lambda - 2.1.1-SNAPSHOT + 2.1.1 jar Lambda