Skip to content

Develop #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tombrus merged 33 commits into from
May 22, 2026
Merged

Develop #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
461e335
prepare for release 4.1.0
tombrus Nov 13, 2023
fe6f5ee
Bump actions/setup-java from 3 to 4
dependabot[bot] Nov 30, 2023
ebcf96e
Merge pull request #38 from ModelingValueGroup/dependabot/github_acti…
tombrus Dec 5, 2023
0f15498
minor reshuffle caused by Context class changes in imm-coll
tombrus Dec 5, 2023
8cd8e4f
Merge remote-tracking branch 'origin/develop' into develop
tombrus Dec 5, 2023
a587e12
[no-ci] updated by mvgplugin
Feb 8, 2024
7554000
push pull
WimBast Mar 11, 2024
c86f8e0
update gradle from 7.6 to 8.7
tombrus Apr 4, 2024
b989953
immediate imperative transactions
WimBast Sep 13, 2024
acb7951
modifiers for imperatives
WimBast Sep 14, 2024
35b3897
[no-ci] updated by mvgplugin
Jan 5, 2025
fc177fb
get Setable -> getRaw
WimBast May 15, 2025
5a50d4e
update
tombrus May 22, 2025
7868abb
Bump actions/checkout from 4 to 5
dependabot[bot] Aug 12, 2025
285d39c
Bump actions/setup-java from 4 to 5
dependabot[bot] Aug 22, 2025
3aea855
Merge remote-tracking branch 'origin/dependabot/github_actions/develo…
tombrus Nov 17, 2025
08150c3
bump checkout to v6
tombrus Dec 2, 2025
a18138d
[no-ci] updated by mvgplugin
Jan 9, 2026
6036747
refactor imports and clean up unused dependencies
WimBast Jan 13, 2026
26621b9
upgrade to java21 and gradle 9
tombrus Feb 26, 2026
b419df7
upgrade IntelliJ project SDK to Java 21
tombrus Mar 2, 2026
60d853b
remove pluginManagement block from settings.gradle.kts
tombrus Mar 2, 2026
9334d2c
upgrade mvgplugin to 2.3.18
tombrus Mar 2, 2026
d209a04
bump plugin version
tombrus Mar 2, 2026
f0ce923
upgrade build.yaml: java 21, remove --scan
tombrus Mar 3, 2026
d19a308
disable failOnNoDiscoveredTests in test task
tombrus Mar 3, 2026
5ab988b
gradle wrapper update
tombrus Mar 3, 2026
6c975c1
bump to new gradle version
tombrus Mar 5, 2026
9e64e69
bump gradle version
tombrus Mar 25, 2026
665c042
remove pom
WimBast Mar 26, 2026
fa9c91c
refactor DClare.java to improve code readability and organization
WimBast May 11, 2026
af3035f
update gradle
tombrus May 20, 2026
13fb636
prepare for release 6.0.0
tombrus May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 19 additions & 14 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
## (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
## ~
## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
## specific language governing permissions and limitations under the License. ~
## ~
## Maintainers: ~
## Wim Bast, Tom Brus, Ronald Krijgsheld ~
## Contributors: ~
## Arjan Kok, Carel Bast ~
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
## (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
## ~
## Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
## compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
## Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
## an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
## specific language governing permissions and limitations under the License. ~
## ~
## Maintainers: ~
## Wim Bast, Tom Brus ~
## ~
## Contributors: ~
## Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
## --------------------------------------------------------------------------------------------------------------------- ~
## In Memory of Ronald Krijgsheld, 1972 - 2023 ~
## Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
## but also our friend. "He will live on in many of the lines of code you see below." ~
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

version: 2
updates:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ on: [ push, workflow_dispatch ]

jobs:
build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[no-ci]')"
env:
ALLREP_TOKEN: "${{secrets.ALLREP_TOKEN}}"
TOKEN: "${{secrets.ALLREP_TOKEN}}"
CI: "true"
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
fetch-depth: 0

- uses: actions/setup-java@v3
- uses: actions/setup-java@v5
with:
java-version: 17
java-version: 21
distribution: zulu

################################################################################
- name: "build"
run: ./gradlew --info --scan
run: ./gradlew --info
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 22 additions & 17 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
// ~
// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
// specific language governing permissions and limitations under the License. ~
// ~
// Maintainers: ~
// Wim Bast, Tom Brus, Ronald Krijgsheld ~
// Contributors: ~
// Arjan Kok, Carel Bast ~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
// ~
// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
// specific language governing permissions and limitations under the License. ~
// ~
// Maintainers: ~
// Wim Bast, Tom Brus ~
// ~
// Contributors: ~
// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
// --------------------------------------------------------------------------------------------------------------------- ~
// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
// but also our friend. "He will live on in many of the lines of code you see below." ~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

defaultTasks("mvgCorrector", "test", "publish", "mvgTagger")

plugins {
`java-library`
`maven-publish`
id("org.modelingvalue.gradle.mvgplugin") version "1.1.3"
id("org.modelingvalue.gradle.mvgplugin") version "2.3.21"
}
dependencies {
implementation("org.modelingvalue:dclare:4.0.0-BRANCHED")
implementation("org.modelingvalue:immutable-collections:4.0.0-BRANCHED")
implementation("org.modelingvalue:dclare:6.0.0-BRANCHED")
implementation("org.modelingvalue:immutable-collections:6.0.0-BRANCHED")
}
publishing {
publications {
Expand Down
40 changes: 24 additions & 16 deletions examples/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
// ~
// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
// specific language governing permissions and limitations under the License. ~
// ~
// Maintainers: ~
// Wim Bast, Tom Brus, Ronald Krijgsheld ~
// Contributors: ~
// Arjan Kok, Carel Bast ~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
// ~
// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
// specific language governing permissions and limitations under the License. ~
// ~
// Maintainers: ~
// Wim Bast, Tom Brus ~
// ~
// Contributors: ~
// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
// --------------------------------------------------------------------------------------------------------------------- ~
// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
// but also our friend. "He will live on in many of the lines of code you see below." ~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

plugins {
java
}
dependencies {
testImplementation(rootProject)
testImplementation(testFixtures(project(":ext")))
testImplementation("org.modelingvalue:dclare:4.0.0-BRANCHED")
testImplementation("org.modelingvalue:immutable-collections:4.0.0-BRANCHED")
testImplementation("org.modelingvalue:dclare:6.0.0-BRANCHED")
testImplementation("org.modelingvalue:immutable-collections:6.0.0-BRANCHED")
testImplementation("com.intellij:forms_rt:7.0.3")
}
tasks.withType(JavaCompile::class) {
options.compilerArgs.add("-Xlint:unchecked")
options.compilerArgs.add("-Xlint:deprecation")
}
tasks.test {
failOnNoDiscoveredTests = false
}
24 changes: 0 additions & 24 deletions examples/pom.xml
View file
Open in desktop

This file was deleted.

33 changes: 19 additions & 14 deletions examples/src/test/java/org/modelingvalue/jdclare/examples/BigUniverse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// (C) Copyright 2018-2023 Modeling Value Group B.V. (http://modelingvalue.org) ~
// ~
// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
// specific language governing permissions and limitations under the License. ~
// ~
// Maintainers: ~
// Wim Bast, Tom Brus, Ronald Krijgsheld ~
// Contributors: ~
// Arjan Kok, Carel Bast ~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// (C) Copyright 2018-2026 Modeling Value Group B.V. (http://modelingvalue.org) ~
// ~
// Licensed under the GNU Lesser General Public License v3.0 (the 'License'). You may not use this file except in ~
// compliance with the License. You may obtain a copy of the License at: https://choosealicense.com/licenses/lgpl-3.0 ~
// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on ~
// an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the ~
// specific language governing permissions and limitations under the License. ~
// ~
// Maintainers: ~
// Wim Bast, Tom Brus ~
// ~
// Contributors: ~
// Ronald Krijgsheld ✝, Arjan Kok, Carel Bast ~
// --------------------------------------------------------------------------------------------------------------------- ~
// In Memory of Ronald Krijgsheld, 1972 - 2023 ~
// Ronald was suddenly and unexpectedly taken from us. He was not only our long-term colleague and team member ~
// but also our friend. "He will live on in many of the lines of code you see below." ~
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

package org.modelingvalue.jdclare.examples;

Expand Down
Loading
Loading