Skip to content

Commit c161ff1

Browse files
committed
bump dependency versions
1 parent a24d395 commit c161ff1

21 files changed

+89
-35
lines changed

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ using Choco[1] and Ojalgo[2].
3535

3636
Command-line arguments for Gradle to see the task names for the available solutions:
3737
```
38-
:McNuggets:tasks --group="Script"
38+
:McNuggets:tasks --group="Application"
3939
```
4040
Then pick one of those tasks to run, e.g. to run the Ojalgo solution:
4141
```

Diff for: build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
plugins {
1818
id 'org.kordamp.gradle.project' version '0.47.0'
1919
id 'com.github.ben-manes.versions' version '0.42.0'
20+
// uncomment next plugin if using JDK11+ and checking buildHealth
21+
// you might also need to comment out some parts of the kotlin build since it relies on JDK8
22+
//id 'com.autonomousapps.dependency-analysis' version '1.12.0'
2023
}
2124

2225
config {

Diff for: docs/RunningGitpod.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Once loaded, run one of the available script tasks. To find
77
available script tasks you can try something like:
88

99
```
10-
> ./gradlew :McNuggets:tasks --group="Scripts"
10+
> ./gradlew :McNuggets:tasks --group="Application"
1111
```
1212

1313
You should see something like below:

Diff for: gradle.properties

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
# limitations under the License.
1515
#
1616

17-
groovy3Version=3.0.11
18-
groovy4Version=4.0.3
19-
chocoVersion=4.10.8
20-
ortoolsVersion=9.3.10497
21-
ojalgoVersion=51.3.0
17+
groovy3Version=3.0.12
18+
groovy4Version=4.0.4
19+
chocoVersion=4.10.9
20+
jacopVersion=4.8.0
21+
ortoolsVersion=9.4.1874
22+
ojalgoVersion=51.4.1
2223
version=0.0.1-SNAPSHOT
2324
group=org.groovycookbook
2425
sourceCompatibility=1.8

Diff for: gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

Diff for: subprojects/Diet/Diet.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
implementation "org.apache.groovy:groovy:$groovy4Version"
2424
implementation "org.choco-solver:choco-solver:$chocoVersion"
2525
implementation "org.ojalgo:ojalgo:$ojalgoVersion"
26-
implementation 'org.jacop:jacop:4.8.0'
26+
implementation "org.jacop:jacop:$jacopVersion"
2727
implementation 'org.apache.commons:commons-math3:3.6.1'
2828
implementation 'org.optaplanner:optaplanner-core:7.71.0.Final'
2929
implementation 'ch.qos.logback:logback-classic:1.2.11' // optional for optaplanner debugging
@@ -33,7 +33,7 @@ dependencies {
3333
FileUtil.baseNames(sourceSets.main.allSource.files).each { name ->
3434
tasks.register("run$name", JavaExec) {
3535
dependsOn compileGroovy
36-
group 'Script'
36+
group 'Application'
3737
description "Run ${name}.groovy as a JVM application/Groovy script"
3838
classpath = sourceSets.main.runtimeClasspath
3939
main = name

Diff for: subprojects/Diet/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ You have the following options to run the examples:
3636

3737
Command-line arguments for Gradle to see the task names for the available solutions:
3838
```
39-
gradlew :Diet:tasks --group="Script"
39+
gradlew :Diet:tasks --group="Application"
4040
```
4141
Then pick one of those tasks to run, e.g. to run the Apache Commons Math solution:
4242
```

Diff for: subprojects/McNuggets/McNuggets.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
FileUtil.baseNames(sourceSets.main.allSource.files).each { name ->
2929
tasks.register("run$name", JavaExec) {
3030
dependsOn compileGroovy
31-
group 'Script'
31+
group 'Application'
3232
description "Run ${name}.groovy as a JVM application/Groovy script"
3333
classpath = sourceSets.main.runtimeClasspath
3434
main = name

Diff for: subprojects/Monkeys/Monkeys.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
FileUtil.baseNames(sourceSets.main.allSource.files).each { name ->
2929
tasks.register("run$name", JavaExec) {
3030
dependsOn compileGroovy
31-
group 'Script'
31+
group 'Application'
3232
description "Run ${name}.groovy as a JVM application/Groovy script"
3333
classpath = sourceSets.main.runtimeClasspath
3434
main = name

Diff for: subprojects/Monkeys/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ You have the following options to run the examples:
6262

6363
Command-line arguments for Gradle to see the task names for the available solutions:
6464
```
65-
gradlew :Monkeys:tasks --group="Script"
65+
gradlew :Monkeys:tasks --group="Application"
6666
```
6767
Then pick one of those tasks to run, e.g. to run the Apache Commons Math solution:
6868
```

Diff for: subprojects/SendMoreMoney/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ gradlew :SendMoreMoney:run
5050

5151
Command-line arguments for Gradle to see the task names for the JavaScript and various Groovy solutions:
5252
```
53-
gradlew :SendMoreMoney:tasks --group="Script"
53+
gradlew :SendMoreMoney:tasks --group="Application"
5454
```
5555
Then pick one of those tasks to run, e.g. to run the Groovy permutations example:
5656
```
@@ -59,12 +59,12 @@ gradlew :SendMoreMoney:runSendMoreMoneyPermutations
5959

6060
For the other languages, choose the appropriate subproject and arguments:
6161
```
62-
gradlew :SendMoreMoneyClojure:tasks --group="Script"
63-
gradlew :SendMoreMoneyFrege:tasks --group="Script"
64-
gradlew :SendMoreMoneyJRuby:tasks --group="Script"
65-
gradlew :SendMoreMoneyJython:tasks --group="Script"
62+
gradlew :SendMoreMoneyClojure:tasks --group="Application"
63+
gradlew :SendMoreMoneyFrege:tasks --group="Application"
64+
gradlew :SendMoreMoneyJRuby:tasks --group="Application"
65+
gradlew :SendMoreMoneyJython:tasks --group="Application"
6666
gradlew :SendMoreMoneyKotlin:run
67-
gradlew :SendMoreMoneyLuaj:tasks --group="Script"
67+
gradlew :SendMoreMoneyLuaj:tasks --group="Application"
6868
gradlew :SendMoreMoneyProlog:run
6969
gradlew :SendMoreMoneyScala:run
7070
```

Diff for: subprojects/SendMoreMoney/SendMoreMoney.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ dependencies {
2626
implementation "org.apache.groovy:groovy:$groovy4Version"
2727
implementation "org.choco-solver:choco-solver:$chocoVersion"
2828
implementation "com.google.ortools:ortools-java:$ortoolsVersion"
29+
implementation "org.jacop:jacop:$jacopVersion"
2930
}
3031

3132
FileUtil.baseNames(sourceSets.main.allSource.files).each { name ->
3233
tasks.register("run$name", JavaExec) {
3334
dependsOn compileGroovy
34-
group 'Script'
35+
group 'Application'
3536
description "Run ${name}.groovy as a JVM application/Groovy script"
3637
classpath = sourceSets.main.runtimeClasspath
3738
main = name

Diff for: subprojects/SendMoreMoney/src/main/groovy/SendMoreMoneyChocoJava.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public static void main(String[] args) {
3333
m.allDifferent(S, E, N, D, M, O, R, Y).post();
3434

3535
IntVar[] ALL = {
36-
S, E, N, D,
37-
M, O, R, E,
38-
M, O, N, E, Y};
36+
S, E, N, D,
37+
M, O, R, E,
38+
M, O, N, E, Y };
3939
int[] COEFFS = {
40-
1000, 100, 10, 1,
41-
1000, 100, 10, 1,
42-
-10000, -1000, -100, -10, -1};
40+
1000, 100, 10, 1,
41+
1000, 100, 10, 1,
42+
-10000, -1000, -100, -10, -1};
4343
m.scalar(ALL, COEFFS, "=", 0).post();
4444

4545
long start = currentTimeMillis();
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
import org.jacop.constraints.Alldifferent
18+
import org.jacop.constraints.LinearInt
19+
import org.jacop.core.IntVar
20+
import org.jacop.core.Store
21+
import org.jacop.search.DepthFirstSearch
22+
import org.jacop.search.IndomainMin
23+
import org.jacop.search.InputOrderSelect
24+
25+
import static java.lang.System.currentTimeMillis
26+
27+
def store = new Store()
28+
def (S, M) = ['S', 'M'].collect { new IntVar(store, it, 1, 9) }
29+
def (E, N, D, O, R, Y) = ['E', 'N', 'D', 'O', 'R', 'Y'].collect { new IntVar(store, it, 0, 9) }
30+
var ctr = new Alldifferent(S, E, N, D, M, O, R, Y)
31+
store.impose(ctr)
32+
33+
IntVar[] ALL = [
34+
S, E, N, D,
35+
M, O, R, E,
36+
M, O, N, E, Y ]
37+
int[] COEFFS = [
38+
1000, 100, 10, 1,
39+
1000, 100, 10, 1,
40+
-10000, -1000, -100, -10, -1 ]
41+
var lin = new LinearInt(ALL, COEFFS, "==", 0)
42+
store.impose(lin)
43+
44+
def start = currentTimeMillis()
45+
var label = new DepthFirstSearch()
46+
var select = new InputOrderSelect(store, ALL, new IndomainMin())
47+
label.labeling(store, select)
48+
println "Solved in ${currentTimeMillis() - start} millis"

Diff for: subprojects/SendMoreMoneyClojure/SendMoreMoneyClojure.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616
plugins {
17-
id 'dev.clojurephant.clojure' version '0.7.0-alpha.1'
17+
id 'dev.clojurephant.clojure' version '0.8.0-beta.1'
1818
}
1919

2020
repositories {
@@ -36,11 +36,12 @@ dependencies {
3636
implementation 'org.clojure:clojure:1.11.1'
3737
implementation 'org.clojure:core.logic:1.0.1'
3838
implementation 'org.clojure:math.combinatorics:0.1.6'
39+
runtimeOnly 'nrepl:nrepl:1.0.0'
3940
}
4041

4142
FileUtil.baseNames(sourceSets.main.allSource.files, [], ['.clj']).each { name ->
4243
tasks.register("run$name", JavaExec) {
43-
group 'Script'
44+
group 'Application'
4445
description "Run ${name}.clj as a Clojure script"
4546
classpath = sourceSets.main.runtimeClasspath
4647
main = name

Diff for: subprojects/SendMoreMoneyFrege/SendMoreMoneyFrege.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mainClassName = "SendMoreMoneyBruteForce"
3232
FileUtil.baseNames(sourceSets.main.allSource.files, [], ['.fr']).each { name ->
3333
tasks.register("run$name", JavaExec) {
3434
dependsOn 'fregeCompile'
35-
group 'Script'
35+
group 'Application'
3636
description "Run ${name}.fr as a Frege script"
3737
classpath = sourceSets.main.runtimeClasspath
3838
main = name

Diff for: subprojects/SendMoreMoneyJRuby/SendMoreMoneyJRuby.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343

4444
FileUtil.baseNames(file("$projectDir/src/main/ruby"), [], '.rb').each { name ->
4545
tasks.register("run$name", JRubyExec) {
46-
group 'Script'
46+
group 'Application'
4747
jruby.jrubyVersion '9.3.4.0'
4848
description "Run ${name}.rb as a JRuby script"
4949
script "${projectDir}/src/main/ruby/${name}.rb"

Diff for: subprojects/SendMoreMoneyJython/SendMoreMoneyJython.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies {
3838

3939
FileUtil.baseNames(file("$projectDir/src/main/jython"), ['SendMoreMoneyConstraint'], '.py').each { name ->
4040
tasks.register("run$name", JavaExec) {
41-
group 'Script'
41+
group 'Application'
4242
description "Run ${name}.py as a Jython script"
4343
classpath = sourceSets.main.runtimeClasspath
4444
main = 'org.python.util.jython'

Diff for: subprojects/SendMoreMoneyKotlin/SendMoreMoneyKotlin.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1717

1818
plugins {
19-
id "org.jetbrains.kotlin.jvm" version "1.7.0"
19+
id "org.jetbrains.kotlin.jvm" version "1.7.10"
2020
id 'application'
2121
}
2222

@@ -27,7 +27,7 @@ repositories {
2727
mainClassName = "SendMoreMoneyChocoKtxKt"
2828

2929
dependencies {
30-
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.0'
30+
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10'
3131
implementation files('lib/choco-ktx-0.0.8.jar')
3232
// above file replaces below until it appears in a public repo - was in bintray
3333
//implementation 'ar.com.agomez:choco-ktx:0.0.8'

Diff for: subprojects/SendMoreMoneyLuaj/SendMoreMoneyLuaj.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727

2828
FileUtil.baseNames(file("$projectDir/src/main/lua"), [], '.lua').each { name ->
2929
tasks.register("run$name", JavaExec) {
30-
group 'Script'
30+
group 'Application'
3131
description "Run ${name}.lua as a Lua script"
3232
classpath = sourceSets.main.runtimeClasspath
3333
main = 'lua'

0 commit comments

Comments
 (0)