diff --git a/CHANGELOG.md b/CHANGELOG.md index 207b6271..2fa2a40c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,22 +3,34 @@ ## Unreleased ### Added -- Relax requirements for `withDefault` and `view`. Now they could be used with `MutableMetaProvider` -- Add `MutableMetaProvider` to `MutableMeta` converter `asMutableMeta`. ### Changed -- Implementation of `Meta::withDefault` ### Deprecated ### Removed ### Fixed -- Incorrect work of `MetaWithDefault::getValue` -- Incorrect work of scheme delegate ### Security +## 0.10.1 - 2025-02-23 + +### Added + +- Relax requirements for `withDefault` and `view`. Now they could be used with `MutableMetaProvider` +- Add `MutableMetaProvider` to `MutableMeta` converter `asMutableMeta`. + +### Changed + +- Implementation of `Meta::withDefault` +- `scheme` extension limited to `MutableMeta` to avoid resolution ambiguity with `Scheme` + +### Fixed + +- Incorrect work of `MetaWithDefault::getValue` +- Incorrect work of scheme delegate + ## 0.10.0 - 2025-01-19 ### Added diff --git a/README.md b/README.md index a3dd7b7b..07dcacb4 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ In this section, we will try to cover DataForge main ideas in the form of questi > **Maturity**: PROTOTYPE ### [dataforge-workspace](dataforge-workspace) +> A framework for pull-based data processing > > **Maturity**: EXPERIMENTAL diff --git a/build.gradle.kts b/build.gradle.kts index 42cde112..cba70f11 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { allprojects { group = "space.kscience" - version = "0.10.1-dev-1" + version = "0.10.1" } subprojects { diff --git a/dataforge-io/README.md b/dataforge-io/README.md index 9b56352e..db7e4547 100644 --- a/dataforge-io/README.md +++ b/dataforge-io/README.md @@ -15,7 +15,7 @@ IO module ## Artifact: -The Maven coordinates of this project are `space.kscience:dataforge-io:0.10.0`. +The Maven coordinates of this project are `space.kscience:dataforge-io:0.10.1`. **Gradle Kotlin DSL:** ```kotlin @@ -25,6 +25,6 @@ repositories { } dependencies { - implementation("space.kscience:dataforge-io:0.10.0") + implementation("space.kscience:dataforge-io:0.10.1") } ``` diff --git a/dataforge-meta/README.md b/dataforge-meta/README.md index 7eb186ed..8d77eb2b 100644 --- a/dataforge-meta/README.md +++ b/dataforge-meta/README.md @@ -13,7 +13,7 @@ Meta definition and basic operations on meta ## Artifact: -The Maven coordinates of this project are `space.kscience:dataforge-meta:0.10.0`. +The Maven coordinates of this project are `space.kscience:dataforge-meta:0.10.1`. **Gradle Kotlin DSL:** ```kotlin @@ -23,6 +23,6 @@ repositories { } dependencies { - implementation("space.kscience:dataforge-meta:0.10.0") + implementation("space.kscience:dataforge-meta:0.10.1") } ``` diff --git a/dataforge-meta/api/dataforge-meta.api b/dataforge-meta/api/dataforge-meta.api index b282c77f..a6455c20 100644 --- a/dataforge-meta/api/dataforge-meta.api +++ b/dataforge-meta/api/dataforge-meta.api @@ -313,7 +313,7 @@ public final class space/kscience/dataforge/meta/MetaKt { public static final fun iterator (Lspace/kscience/dataforge/meta/Meta;)Ljava/util/Iterator; public static final fun nodeSequence (Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; public static final fun valueSequence (Lspace/kscience/dataforge/meta/Meta;)Lkotlin/sequences/Sequence; - public static final fun withDefault (Lspace/kscience/dataforge/meta/Meta;Lspace/kscience/dataforge/meta/MetaProvider;)Lspace/kscience/dataforge/meta/Meta; + public static final fun withDefault (Lspace/kscience/dataforge/meta/MetaProvider;Lspace/kscience/dataforge/meta/MetaProvider;)Lspace/kscience/dataforge/meta/Meta; } public abstract interface class space/kscience/dataforge/meta/MetaProvider : space/kscience/dataforge/meta/ValueProvider { @@ -502,7 +502,8 @@ public final class space/kscience/dataforge/meta/MutableMetaKt { public static synthetic fun setIndexed$default (Lspace/kscience/dataforge/meta/MutableMetaProvider;Lspace/kscience/dataforge/names/Name;Ljava/lang/Iterable;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)V public static final fun toMutableMeta (Lspace/kscience/dataforge/meta/Meta;)Lspace/kscience/dataforge/meta/MutableMeta; public static final fun update (Lspace/kscience/dataforge/meta/MutableMetaProvider;Lspace/kscience/dataforge/meta/Meta;)V - public static final fun withDefault (Lspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/dataforge/meta/MetaProvider;)Lspace/kscience/dataforge/meta/MutableMeta; + public static final fun withDefault (Lspace/kscience/dataforge/meta/MutableMetaProvider;Lspace/kscience/dataforge/meta/MetaProvider;)Lspace/kscience/dataforge/meta/MutableMeta; + public static final fun withDefaults (Lspace/kscience/dataforge/meta/MutableMetaProvider;[Lspace/kscience/dataforge/meta/MetaProvider;)Lspace/kscience/dataforge/meta/MutableMeta; } public abstract interface class space/kscience/dataforge/meta/MutableMetaProvider : space/kscience/dataforge/meta/MetaProvider, space/kscience/dataforge/meta/MutableValueProvider { @@ -521,8 +522,9 @@ public final class space/kscience/dataforge/meta/MutableMetaSerializer : kotlinx } public final class space/kscience/dataforge/meta/MutableMetaViewKt { - public static final fun view (Lspace/kscience/dataforge/meta/MutableMeta;Ljava/lang/String;)Lspace/kscience/dataforge/meta/MutableMeta; - public static final fun view (Lspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/MutableMeta; + public static final fun asMutableMeta (Lspace/kscience/dataforge/meta/MutableMetaProvider;)Lspace/kscience/dataforge/meta/MutableMeta; + public static final fun view (Lspace/kscience/dataforge/meta/MutableMetaProvider;Ljava/lang/String;)Lspace/kscience/dataforge/meta/MutableMeta; + public static final fun view (Lspace/kscience/dataforge/meta/MutableMetaProvider;Lspace/kscience/dataforge/names/Name;)Lspace/kscience/dataforge/meta/MutableMeta; } public abstract interface class space/kscience/dataforge/meta/MutableTypedMeta : space/kscience/dataforge/meta/MutableMeta, space/kscience/dataforge/meta/TypedMeta { @@ -625,9 +627,9 @@ public final class space/kscience/dataforge/meta/SchemeKt { public static final fun listOfScheme (Lspace/kscience/dataforge/meta/Scheme;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; public static synthetic fun listOfScheme$default (Lspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; public static synthetic fun listOfScheme$default (Lspace/kscience/dataforge/meta/Scheme;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; - public static final fun scheme (Lspace/kscience/dataforge/meta/MutableMetaProvider;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; + public static final fun scheme (Lspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; public static final fun scheme (Lspace/kscience/dataforge/meta/Scheme;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; - public static synthetic fun scheme$default (Lspace/kscience/dataforge/meta/MutableMetaProvider;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; + public static synthetic fun scheme$default (Lspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; public static synthetic fun scheme$default (Lspace/kscience/dataforge/meta/Scheme;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;ILjava/lang/Object;)Lkotlin/properties/ReadWriteProperty; public static final fun schemeOrNull (Lspace/kscience/dataforge/meta/MutableMeta;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty; public static final fun schemeOrNull (Lspace/kscience/dataforge/meta/Scheme;Lspace/kscience/dataforge/meta/SchemeSpec;Lspace/kscience/dataforge/names/Name;)Lkotlin/properties/ReadWriteProperty;