diff --git a/build.gradle.kts b/build.gradle.kts index 68f7f49..762ff41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,8 +4,10 @@ group = "com.chutneytesting" version = "0.1.0-SNAPSHOT" description = "A GitHub project template to help you start with Chutney Kotlin DSL" +val chutneyVersion = "2.9.0" + plugins { - kotlin("jvm") version "1.8.22" apply true + kotlin("jvm") version "1.9.25" apply true } repositories { @@ -13,9 +15,11 @@ repositories { } dependencies { - api("org.jetbrains.kotlin:kotlin-stdlib:1.8.22") - api("com.chutneytesting:chutney-kotlin-dsl:[2.0.0,)") - testImplementation("org.junit.jupiter:junit-jupiter:5.8.2") + api("org.jetbrains.kotlin:kotlin-stdlib:1.9.25") + + implementation(enforcedPlatform("com.chutneytesting:chutney-parent:$chutneyVersion")) + api("com.chutneytesting:chutney-kotlin-dsl:$chutneyVersion") + testImplementation("org.junit.jupiter:junit-jupiter") } tasks.withType { @@ -47,4 +51,3 @@ tasks { finalizedBy("chutneyReportSite") } } - diff --git a/chutney_environments/english_web.json b/chutney_environments/conf/environment/english_web.json similarity index 100% rename from chutney_environments/english_web.json rename to chutney_environments/conf/environment/english_web.json diff --git a/chutney_environments/french_web.json b/chutney_environments/conf/environment/french_web.json similarity index 100% rename from chutney_environments/french_web.json rename to chutney_environments/conf/environment/french_web.json diff --git a/docker-compose.yml b/docker-compose.yml index c8aaa20..3303beb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,16 +2,9 @@ version: "3.9" services: chutney-server: container_name: chutney-server - image: ghcr.io/chutney-testing/chutney/server:latest + image: ghcr.io/chutney-testing/chutney/chutney-server:latest restart: unless-stopped ports: - "8081:8443" volumes: - ./chutney_environments:/.chutney - chutney-ui: - container_name: chutney-ui - image: ghcr.io/chutney-testing/chutney/ui:latest - restart: unless-stopped - ports: - - "80:80" - - "443:443" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/pom.xml b/pom.xml index 8ae75fe..84529d2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,30 +15,51 @@ 17 17 - 1.8.22 + 1.9 + 1.9 + ${maven.compiler.target} - [2.0.0,) - 5.8.2 - - 2.22.2 + 1.9.25 + 2.9.0 + + + + org.jetbrains.kotlin + kotlin-bom + ${kotlin.version} + pom + import + + + com.chutneytesting + chutney-parent + ${chutney.version} + pom + import + + + com.chutneytesting + chutney-kotlin-dsl + ${chutney.version} + + + + org.jetbrains.kotlin kotlin-stdlib - ${kotlin.version} - com.chutneytesting chutney-kotlin-dsl - ${chutney-kotlin-dsl.version} + org.junit.jupiter junit-jupiter - ${junit-jupiter.version} test @@ -47,27 +68,6 @@ ${project.basedir}/src/main/kotlin ${project.basedir}/src/test/kotlin - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - chutney_environments - target/chutney/reports - - true - - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M7 - - - org.jetbrains.kotlin @@ -89,36 +89,18 @@ - maven-failsafe-plugin + maven-surefire-plugin + 3.3.0 - - **/*Test.* - - ${project.build.outputDirectory} - - ${project.basedir}/chutney_environments + + ${project.basedir}/chutney_environments + ${project.build.directory}/chutney-reports false true - + - - - - integration-test - verify - - - - - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - - - diff --git a/src/main/kotlin/com/chutneytesting/hello/SynchronizeToServer.kt b/src/main/kotlin/com/chutneytesting/hello/SynchronizeToServer.kt index 1caf139..b85261b 100644 --- a/src/main/kotlin/com/chutneytesting/hello/SynchronizeToServer.kt +++ b/src/main/kotlin/com/chutneytesting/hello/SynchronizeToServer.kt @@ -1,5 +1,6 @@ package com.chutneytesting.hello +import com.chutneytesting.kotlin.synchronize.jsonSerialize import com.chutneytesting.kotlin.synchronize.synchronise import com.chutneytesting.kotlin.util.ChutneyServerInfo @@ -8,5 +9,8 @@ val chutneyLocalServer = ChutneyServerInfo( ) fun main() { - test_suite.forEach { it.synchronise(serverInfo = chutneyLocalServer, updateRemote = true) } + test_suite.forEach { + it.jsonSerialize("src/main/resources/chutney/in_progress") + it.synchronise(serverInfo = chutneyLocalServer) + } }