Release 2.3.0 (#7)

Author: koppor

.github/workflows/publish.yml

@@ -2,7 +2,7 @@ name: Publish
 
 on:
   push:
-    branches: [ main,  hotfix , testRelease]
+    branches: [ main,  hotfix, testRelease]
   workflow_dispatch:
 
 jobs:
@@ -20,18 +20,16 @@ jobs:
         java-version: '17'
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v3
-      with:
-        gradle-home-cache-cleanup: true
+      uses: gradle/actions/setup-gradle@v4
 
     - name: Build
       run: ./gradlew build
 
     - name: Publish to Sonatype (for snapshots) or to Maven Central
       run: ./gradlew publish closeAndReleaseRepository
       env:
-        MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-        MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+        OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+        OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
         SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}

CHANGELOG.md

@@ -1,38 +1,52 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+
 ### Added
+
 - Added `EasyBind.mapBacked(ObservableList<A> source, Function<A, B> mapper, boolean mapOnUpdate)` method to control whether new objects are created on updates. [#5](https://github.com/JabRef/EasyBind/pull/5)
 
 ### Changed
+
 - Fixed an issue in `EasyBind#mapBacked` where updates to the source `ObservableList` elements were not reflected in the `SortedList`. [#5](https://github.com/JabRef/EasyBind/pull/5)
 
-### Removed
+### Fixed
+
+- Changed maven coordinates to `org.jabref` in `README.md`
 
 ## [2.2.0] - 2021-05-18
+
 ### Added
+
 ### Changed
+
 - Mark JavaFX dependency as transitive. Thanks to Sebastian Stenzel.
 - Remove `classifier = linux` for JavaFX dependency in the `pom` file. This makes it easier to use the library on different OS without pulling-in the wrong dependencies.
 
 ### Removed
 
 ## [2.1.0] - 2020-08-13
+
 ### Added
+
 - Added support for JDK >= 9. [#21](https://github.com/tobiasdiez/EasyBind/issues/21)
 - Added `EasyObservableList#mapped` as fluid alternative to `EasyBind#map`
 - Added `EasyObservableList#filteredWrapped` as an alternative to `EasyObservableList#filtered` that returns an `EasyObservableList` instead of a `FilteredList`.
   - This allows fluid method chaining without having to wrap the `FilteredList` using `EasyBind#wrapList` again.
   - It is a temporary workaround that will be removed once https://github.com/openjdk/jfx/pull/278 is merged.
 
 ### Changed
+
 - `EasyBind#flatten` and `EasyBind#concat` now return an `EasyObservableList` instead of an `ObservableList`.
 
 ### Removed
 
 ## [2.0.0] - 2020-07-17
+
 ### Added
+
 - Added new interface `EasyObservableList` which is a wrapper around a standard `ObservableList` providing access to a few convenient helper methods. Use `EasyBind.wrapList` to create such a wrapper around a given `ObservableList`.
 - Added new method `EasyBind.reduce(list, accumulation)` that creates a binding holding the result of the accumulation function on the provided list.
 - Added a few new methods `EasyBind.valueAt` that are essentially equivalent to the standard `Bindings.valueAt` methods except that they gracefully handle non-existing values by returning a `OptionalBinding`.
@@ -41,6 +55,7 @@ All notable changes to this project will be documented in this file.
   - New methods that create bindings whose value is computed similar to the corresponding methods in `Optional`, e.g. `isPresent`, `isEmpty`, `orElse`, `flatMap`.
 
 ### Changed
+
 - Renamed package to `com.tobiasdiez.easybind`.
 - Split `MonadicBinding` into a part which is really concerned with optionals (new `ObervableOptionalValue`) and one which provides helper methods for a fluent interface for normal bindings (new `EasyBinding`).
 - Renamed `flatMap` to `mapObservable` to avoid clashes with the corresponding method in `Optional`.
@@ -50,12 +65,14 @@ All notable changes to this project will be documented in this file.
 - Moved `PropertyBinding` to `com.tobiasdiez.easybind`.
 
 ### Removed
+
 - Removed `EasyBind.filter(ObservableValue<T> source, Predicate<? super T> predicate)`. Use `EasyBind.wrapNullable(source).filter(predicate)` instead. 
 - Removed `EasyBind.orElse(ObservableValue<? extends T> source, T other)`. Use `EasyBind.wrapNullable(source).orElse(other)` instead. 
 
-
 ## [1.2.2] - 2020-05-05
+
 ### Added
+
 - `EasyBind.flatten(List<ObservableList<T>> lists)` and `EasyBind.concat(ObservableList<T>... lists)` that create a new list combining the values of the given lists. Unlike `FXCollections.concat()`, updates to the source lists propagate to the combined list.
 - `EasyBind.mapBacked(ObservableList<A> source, Function<A, B> mapper)` that works similar to `EasyBind.map` with the important difference that the `mapper` is applied only on initializing the list and not every time an item in the list is accessed.
 - `EasyBind.filter`
@@ -65,12 +82,14 @@ All notable changes to this project will be documented in this file.
 - Support for Java Module System by providing correct module information.
 
 ## [1.0.3] - 2014-08-19
-Last official release by [Tomas Mikula](https://github.com/TomasMikula/EasyBind) under the name `org.fxmisc.easybind:easybind`.
 
+Last official release by [Tomas Mikula](https://github.com/TomasMikula/EasyBind) under the name `org.fxmisc.easybind:easybind`.
 
 [Unreleased]: https://github.com/tobiasdiez/EasyBind/compare/v1.2.2...master
 [2.2.0]: https://github.com/tobiasdiez/EasyBind/compare/2.1.0...2.2.0
 [2.1.0]: https://github.com/tobiasdiez/EasyBind/compare/2.0.0...2.1.0
 [2.0.0]: https://github.com/tobiasdiez/EasyBind/compare/v1.2.2...2.0.0
 [1.2.2]: https://github.com/tobiasdiez/EasyBind/compare/v1.0.3...v1.2.2
 [1.0.3]: https://github.com/tobiasdiez/EasyBind/releases/tag/v1.0.3
+
+<!-- markdownlint-disable-file MD024 MD033 MD053 -->

README.md

@@ -228,34 +228,30 @@ Use EasyBind in your project
 
 ### Stable release
 
-Current stable release is `2.2.0`.
+Current stable release is `2.3.0`.
 It contains many new features, but also breaks backwards compatibility to the `1.x` versions as many methods have been renamed; see the [Changelog](CHANGELOG.md) for details.
-In case you are upgrading from the `EasyBind` library developed by by Tomas Mikula, then the easiest option is to use version `1.2.2` which includes a few improvements and bug fixes while being compatible with older versions.
+In case you are upgrading from the `EasyBind` library developed by Tomas Mikula, then the easiest option is to use version `1.2.2` which includes a few improvements and bug fixes while being compatible with older versions.
 
 #### Maven coordinates
 
 | Group ID            | Artifact ID | Version |
 | :-----------------: | :---------: | :-----: |
-| com.tobiasdiez      | easybind    | 2.2.0   |
+| org.jabref      | easybind    | 2.3.0   |
 
 #### Gradle example
 
 ```groovy
 dependencies {
-    compile group: 'com.tobiasdiez', name: 'easybind', version: '2.2.0'
+    compile group: 'org.jabref', name: 'easybind', version: '2.3.0'
 }
 ```
 
 #### Sbt example
 
 ```scala
-libraryDependencies += "com.tobiasdiez" % "easybind" % "2.2.0"
+libraryDependencies += "org.jabref" % "easybind" % "2.3.0"
 ```
 
-#### Manual download
-
-[Download](https://github.com/tobiasdiez/EasyBind/releases) the JAR file and place it on your classpath.
-
 ### Snapshot releases
 
 Snapshot releases are deployed to Sonatype snapshot repository.
@@ -264,7 +260,7 @@ Snapshot releases are deployed to Sonatype snapshot repository.
 
 | Group ID            | Artifact ID | Version        |
 | :-----------------: | :---------: | :------------: |
-| com.tobiasdiez      | easybind    | 2.2.1-SNAPSHOT |
+| org.jabref      | easybind    | 2.3.1-SNAPSHOT |
 
 #### Gradle example
 
@@ -276,7 +272,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.jabref', name: 'easybind', version: '2.2.1-SNAPSHOT'
+    compile group: 'org.jabref', name: 'easybind', version: '2.3.1-SNAPSHOT'
 }
 ```
 
@@ -285,9 +281,5 @@ dependencies {
 ```scala
 resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
 
-libraryDependencies += "org.jabref" % "easybind" % "2.2.1-SNAPSHOT"
+libraryDependencies += "org.jabref" % "easybind" % "2.3.1-SNAPSHOT"
 ```
-
-#### Manual download
-
-[Download](https://oss.sonatype.org/content/repositories/snapshots/com/tobiasdiez/easybind/) the latest JAR file and place it on your classpath.

build.gradle

@@ -7,9 +7,8 @@ plugins {
     id 'org.javamodularity.moduleplugin' version '1.8.15'
 }
 
-
 group = 'org.jabref'
-version = '2.2.1-SNAPSHOT'
+version = '2.3.0'
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
 sourceCompatibility = JavaVersion.VERSION_17
@@ -47,7 +46,7 @@ publishing {
             pom {
                 name = 'EasyBind'
                 description = 'Factory methods for easy creation of JavaFX bindings using lambdas.'
-                url = 'https://github.com/tobiasdiez/EasyBind'
+                url = 'https://github.com/JabRef/EasyBind'
 
                 licenses {
                     license {
@@ -57,18 +56,15 @@ publishing {
                     }
                 }
 
-
                 developers {
                     developer {
                         id = 'siedlerchr'
                         name = 'Christoph Schwentker'
                     }
-
                     developer {
                         id = 'koppor'
                         name = 'Oliver Kopp'
                     }
-
                     developer {
                         id = 'tobiasdiez'
                         name = 'Tobias Diez'
@@ -77,6 +73,7 @@ publishing {
                         name = 'Tomas Mikula'
                     }
                 }
+
                 scm {
                     url = 'https://github.com/JabRef/EasyBind'
                     connection = 'scm:git:git://github.com/JabRef/EasyBind.git'
@@ -92,18 +89,19 @@ signing {
     useInMemoryPgpKeys(System.getenv("SIGNING_KEY"), System.getenv("SIGNING_PASSWORD"))
     sign publishing.publications.mavenJava
 }
+
 nexusPublishing {
     repositories {
-        sonatype {  //only for users registered in Sonatype after 24 Feb 2021
-            username = System.getenv("MAVEN_USERNAME")
-            password = System.getenv("MAVEN_PASSWORD")
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+        // see https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#configuration
+        sonatype {
+            username = System.getenv("OSSRH_USERNAME")
+            password = System.getenv("OSSRH_TOKEN")
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
         }
     }
 }
 
-
 test {
     useJUnitPlatform()
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell