diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf8b7b7..d5e95e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,6 +61,13 @@ jobs: env: NATIVE_BINARY_PATH: build/native/nativeCompile/migtool + - name: TestsNative reports + uses: actions/upload-artifact@v2 + if: failure() + with: + name: linux-test-reports + path: build/reports/tests/nativeCliTest/ + release: name: Release if: "contains(github.event.head_commit.message, '[release]') && github.event.ref=='refs/heads/master'" diff --git a/build.gradle b/build.gradle index e3420d3..a7a0a75 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ plugins { id 'java' id 'groovy' id 'application' - id 'org.graalvm.buildtools.native' version '0.9.28' + id 'org.graalvm.buildtools.native' version '0.10.0' id 'maven-publish' } @@ -25,7 +25,7 @@ java { compileJava { // Set binary compatibility for Java compiler to 11 (worth checking to update this also) - options.release.set(11) + options.release.set(17) } } @@ -43,22 +43,17 @@ dependencies { // This dependency is used by the application. implementation "ch.qos.logback:logback-classic:1.2.3" runtimeOnly 'mysql:mysql-connector-java:8.0.22' - runtimeOnly 'com.h2database:h2:1.4.200' + runtimeOnly 'com.h2database:h2:2.2.224' runtimeOnly 'mysql:mysql-connector-java:8.0.28' runtimeOnly 'org.xerial:sqlite-jdbc:3.36.0.3' implementation 'info.picocli:picocli:4.6.3' annotationProcessor 'info.picocli:picocli-codegen:4.6.3' - - implementation "org.codehaus.groovy:groovy:3.0.9" - implementation "org.codehaus.groovy:groovy-sql:3.0.9" + implementation 'org.apache.groovy:groovy-sql:4.0.16' // Use the latest Groovy version for Spock testing - testImplementation "org.codehaus.groovy:groovy:3.0.9" - testImplementation "org.codehaus.groovy:groovy-nio:3.0.9" - testImplementation platform("org.spockframework:spock-bom:2.1-groovy-3.0") - testImplementation "org.spockframework:spock-core" - testImplementation "org.spockframework:spock-junit4" // you can remove this if your code does not rely on old JUnit 4 rules - testImplementation 'junit:junit:4.13' + testImplementation 'org.apache.groovy:groovy:4.0.16' + testImplementation 'org.apache.groovy:groovy-nio:4.0.16' + testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0' testImplementation "org.testcontainers:testcontainers:1.16.3" testImplementation "org.testcontainers:mysql:1.16.3" testImplementation "org.testcontainers:spock:1.16.3" @@ -67,7 +62,7 @@ dependencies { testImplementation files("libs/jar-with-resources.jar") nativeCliTestImplementation project - nativeCliTestImplementation "org.codehaus.groovy:groovy-sql:3.0.9" + nativeCliTestImplementation 'org.apache.groovy:groovy-sql:4.0.16' } test { @@ -124,7 +119,6 @@ graalvmNative { buildArgs(org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem.isLinux() ? ['--static', ] : []) - buildArgs.add('--allow-incomplete-classpath') buildArgs.add('--report-unsupported-elements-at-runtime') buildArgs.add('--initialize-at-run-time=sun.nio.ch.WindowsAsynchronousFileChannelImpl$DefaultIocpHolder') buildArgs.add('-H:+AddAllCharsets') diff --git a/changelog.txt b/changelog.txt index aae957a..8b377c9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,11 @@ MIGTOOL CHANGE-LOG =================== +1.6.1 - 23 Jan 2024 +- Updated Groovy version to 4.0.16 + +1.6.0 - 23 Jan 2024 +- Updated Gradle version to 8.5 + 1.5.0 - 22 Jan 2024 - Add support for patch and override files @@ -18,4 +24,4 @@ MIGTOOL CHANGE-LOG - Add support for migration files name custom pattern 1.0.0 - 28 Dec 2020 -- First release \ No newline at end of file +- First release diff --git a/gradle.properties b/gradle.properties index 992c708..e69de29 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +0,0 @@ -micronautVersion=2.2.2 diff --git a/src/nativeCliTest/groovy/io/seqera/migtool/MysqlTest.groovy b/src/nativeCliTest/groovy/io/seqera/migtool/MysqlTest.groovy index a277ca3..0a9055c 100644 --- a/src/nativeCliTest/groovy/io/seqera/migtool/MysqlTest.groovy +++ b/src/nativeCliTest/groovy/io/seqera/migtool/MysqlTest.groovy @@ -2,7 +2,6 @@ package io.seqera.migtool import groovy.sql.Sql import org.testcontainers.containers.MySQLContainer -import spock.lang.IgnoreIf import spock.lang.Requires import spock.lang.Specification import spock.lang.Timeout diff --git a/src/nativeCliTest/groovy/io/seqera/migtool/SqliteTest.groovy b/src/nativeCliTest/groovy/io/seqera/migtool/SqliteTest.groovy index f042dc5..4999f66 100644 --- a/src/nativeCliTest/groovy/io/seqera/migtool/SqliteTest.groovy +++ b/src/nativeCliTest/groovy/io/seqera/migtool/SqliteTest.groovy @@ -1,15 +1,13 @@ package io.seqera.migtool -import groovy.sql.Sql -import org.testcontainers.containers.MySQLContainer import spock.lang.Requires -import spock.lang.Shared import spock.lang.Specification import spock.lang.Timeout import java.nio.file.Files import java.nio.file.Path +import groovy.sql.Sql @Timeout(30) @Requires({System.getenv('NATIVE_BINARY_PATH')})