Skip to content

Commit afcce02

Browse files
committed
Updated for FJ 5.0
1 parent f177345 commit afcce02

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

‎src/jbake/content/docs.adoc

+13-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ Release notes are available from the link:download.html[download page]. Alterna
2121

2222
== Javadoc
2323

24+
=== 5.0
25+
26+
* http://www.functionaljava.org/javadoc/5.0/functionaljava/index.html[5.0 - functionaljava]
27+
* http://www.functionaljava.org/javadoc/5.0/functionaljava-quickcheck/index.html[5.0 - functionaljava-quickcheck]
28+
* http://www.functionaljava.org/javadoc/5.0/functionaljava-java-core/index.html[5.0 - functionaljava-java-core]
29+
30+
=== 4.9
31+
32+
TODO
33+
2434
=== 4.8.1
2535

2636
* http://www.functionaljava.org/javadoc/4.8.1/functionaljava/index.html[4.8.1 - functionaljava]
@@ -80,7 +90,9 @@ Release notes are available from the link:download.html[download page]. Alterna
8090

8191
== Building
8292

83-
FunctionalJava uses the Retro Lambda project to backport Java 8 lambdas to Java 6 bytecode. This requires access to both JDK 6 and 8. The build system requires the environment variables `JAVA6_HOME` and `JAVA8_HOME` to refer to the appropriate directories.
93+
FunctionalJava 5.x uses Java 8. Future releases will follow the Java long term support model, the future series 6.x uses Java 11 and 7.x uses Java 17.
94+
95+
The FunctionalJava 4.x series uses the Retro Lambda project to backport Java 8 lambdas to Java 6 bytecode. This requires access to both JDK 6 and 8. The build system requires the environment variables `JAVA6_HOME` and `JAVA8_HOME` to refer to the appropriate directories.
8496

8597
Building is done using Gradle. In the root directory run:
8698
----

‎src/jbake/content/download.adoc

+4-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ The recommended way to download the project is by including the Functional Java
1717

1818
The current stable release of Functional Java is {fj_version_stable}. Release notes for each release are available below:
1919

20-
* https://github.com/functionaljava/functionaljava/blob/master/ChangeLog.md[4.8 and later]
20+
* https://github.com/functionaljava/functionaljava/blob/master/etc/release-notes/release-notes-5.0.adoc[5.0]
21+
* https://github.com/functionaljava/functionaljava/blob/master/etc/release-notes/release-notes-4.9.adoc[4.9]
22+
* https://github.com/functionaljava/functionaljava/blob/master/etc/release-notes/release-notes-4.8.1.adoc[4.8.1]
23+
* https://github.com/functionaljava/functionaljava/blob/master/etc/release-notes/release-notes-4.8.adoc[4.8]
2124
* https://github.com/functionaljava/functionaljava/blob/master/etc/release-notes/release-notes-4.7.adoc[4.7]
2225
* https://github.com/functionaljava/functionaljava/blob/master/etc/release-notes/release-notes-4.6.adoc[4.6]
2326
* https://github.com/functionaljava/functionaljava/blob/master/etc/release-notes/release-notes-4.5.adoc[4.5]

‎src/jbake/content/index.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ image::/img/logo-600x144.png[]
88

99
Functional Java is an open source library facilitating functional programming in Java. The library implements numerous basic and advanced programming abstractions that assist composition oriented development. Functional Java also serves as a platform for learning functional programming concepts by introducing these concepts using a familiar language.
1010

11-
The library is intended for use in production applications and is thoroughly tested using the technique of automated specification-based testing with http://www.scalacheck.org[ScalaCheck] and Functional Java's Quickcheck module. Functional Java is compiled with Java 8 targeting Java 6 bytecode. The use of lambdas within the project are backported with the https://github.com/orfjackal/retrolambda[Retro Lambda] library, supporting Java versions 5 to 8 and beyond.
11+
The library is intended for use in production applications and is thoroughly tested using the technique of automated specification-based testing with http://www.scalacheck.org[ScalaCheck] and Functional Java's Quickcheck module. The latest version, 5.0, is compiled with Java 8 targeting Java 8 bytecode. The 4.x series targets Java 6 bytecode. The future 6.x series and 7.x series target Java 11 and 17 respectively. The use of lambdas within the project for the 4.x releases are backported with the https://github.com/orfjackal/retrolambda[Retro Lambda] library.
1212

1313
== Features
1414

‎src/jbake/content/quickstart.adoc

-7
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ The latest stable version as at July 2015 is {fj_version_stable}. Here is how t
88
The Functional Java artifact is published to Maven Central using the group `org.functionaljava` with three published artifacts:
99

1010
* the core library (`functionaljava`)
11-
* Java 8 specific support (`functionaljava-java8`)
1211
* Quickcheck property based testing module (`functionaljava-quickcheck`)
1312
* Java core helper, a simple functional helper for java.util standard types (`functionaljava-java-core`)
1413
@@ -19,7 +18,6 @@ To add Functional Java to your Gradle project, add the following snippet to the
1918
[subs="attributes"]
2019
----
2120
compile "org.functionaljava:functionaljava:{fj_version_stable}"
22-
compile "org.functionaljava:functionaljava-java8:{fj_version_stable}"
2321
compile "org.functionaljava:functionaljava-quickcheck:{fj_version_stable}"
2422
compile "org.functionaljava:functionaljava-java-core:{fj_version_stable}"
2523
----
@@ -35,11 +33,6 @@ Add the following dependencies.
3533
<artifactId>functionaljava</artifactId>
3634
<version>{fj_version_stable}</version>
3735
</dependency>
38-
<dependency>
39-
<groupId>org.functionaljava</groupId>
40-
<artifactId>functionaljava-java8</artifactId>
41-
<version>{fj_version_stable}</version>
42-
</dependency>
4336
<dependency>
4437
<groupId>org.functionaljava</groupId>
4538
<artifactId>functionaljava-quickcheck</artifactId>

‎src/jbake/jbake.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,6 @@ asciidoctor.attributes.export=true
120120
# prefix that should be used when JBake config options are exported
121121
#asciidoctor.attributes.export.prefix=
122122

123-
fj.version.stable=4.8.1
124-
fj.version.snapshot=4.9-SNAPSHOT
123+
fj.version.stable=5.0
124+
fj.version.snapshot=5.1-SNAPSHOT
125125
gradle.version=4.3

0 commit comments

Comments
 (0)