Skip to content

Commit 0e9c8d2

Browse files
committed
Bumps Groovy version to 4.0.16
1 parent 43585e4 commit 0e9c8d2

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

build.gradle

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,12 @@ dependencies {
4949
implementation 'info.picocli:picocli:4.6.3'
5050
annotationProcessor 'info.picocli:picocli-codegen:4.6.3'
5151

52-
implementation "org.codehaus.groovy:groovy:3.0.9"
53-
implementation "org.codehaus.groovy:groovy-sql:3.0.9"
52+
implementation 'org.apache.groovy:groovy-sql:4.0.16'
5453

5554
// Use the latest Groovy version for Spock testing
56-
testImplementation "org.codehaus.groovy:groovy:3.0.9"
57-
testImplementation "org.codehaus.groovy:groovy-nio:3.0.9"
58-
testImplementation platform("org.spockframework:spock-bom:2.1-groovy-3.0")
59-
testImplementation "org.spockframework:spock-core"
60-
testImplementation "org.spockframework:spock-junit4" // you can remove this if your code does not rely on old JUnit 4 rules
61-
testImplementation 'junit:junit:4.13'
55+
testImplementation 'org.apache.groovy:groovy:4.0.16'
56+
testImplementation 'org.apache.groovy:groovy-nio:4.0.16'
57+
testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
6258
testImplementation "org.testcontainers:testcontainers:1.16.3"
6359
testImplementation "org.testcontainers:mysql:1.16.3"
6460
testImplementation "org.testcontainers:spock:1.16.3"
@@ -67,7 +63,7 @@ dependencies {
6763
testImplementation files("libs/jar-with-resources.jar")
6864

6965
nativeCliTestImplementation project
70-
nativeCliTestImplementation "org.codehaus.groovy:groovy-sql:3.0.9"
66+
nativeCliTestImplementation 'org.apache.groovy:groovy-sql:4.0.16'
7167
}
7268

7369
test {
@@ -124,7 +120,6 @@ graalvmNative {
124120

125121

126122
buildArgs(org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem.isLinux() ? ['--static', ] : [])
127-
buildArgs.add('--allow-incomplete-classpath')
128123
buildArgs.add('--report-unsupported-elements-at-runtime')
129124
buildArgs.add('--initialize-at-run-time=sun.nio.ch.WindowsAsynchronousFileChannelImpl$DefaultIocpHolder')
130125
buildArgs.add('-H:+AddAllCharsets')

changelog.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
MIGTOOL CHANGE-LOG
22
===================
3+
1.6.1 - 23 Jan 2024
4+
- Updated Groovy version to 4.0.16
5+
6+
1.6.0 - 23 Jan 2024
7+
- Updated Gradle version to 8.5
8+
39
1.5.0 - 22 Jan 2024
410
- Add support for patch and override files
511

@@ -18,4 +24,4 @@ MIGTOOL CHANGE-LOG
1824
- Add support for migration files name custom pattern
1925

2026
1.0.0 - 28 Dec 2020
21-
- First release
27+
- First release

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
micronautVersion=2.2.2

src/nativeCliTest/groovy/io/seqera/migtool/MysqlTest.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package io.seqera.migtool
22

33
import groovy.sql.Sql
44
import org.testcontainers.containers.MySQLContainer
5-
import spock.lang.IgnoreIf
65
import spock.lang.Requires
76
import spock.lang.Specification
87
import spock.lang.Timeout

src/nativeCliTest/groovy/io/seqera/migtool/SqliteTest.groovy

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package io.seqera.migtool
22

3-
import groovy.sql.Sql
4-
import org.testcontainers.containers.MySQLContainer
53
import spock.lang.Requires
6-
import spock.lang.Shared
74
import spock.lang.Specification
85
import spock.lang.Timeout
96

107
import java.nio.file.Files
118
import java.nio.file.Path
129

10+
import groovy.sql.Sql
1311

1412
@Timeout(30)
1513
@Requires({System.getenv('NATIVE_BINARY_PATH')})

0 commit comments

Comments
 (0)