Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down
22 changes: 8 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand All @@ -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)
}
}

Expand All @@ -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"
Expand All @@ -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 {
Expand Down Expand Up @@ -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')
Expand Down
8 changes: 7 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -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

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

1.0.0 - 28 Dec 2020
- First release
- First release
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
micronautVersion=2.2.2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions src/nativeCliTest/groovy/io/seqera/migtool/SqliteTest.groovy
Original file line number Diff line number Diff line change
@@ -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')})
Expand Down