Skip to content

Commit

Permalink
update build (#367)
Browse files Browse the repository at this point in the history
* use kotlin dsl

kotlin dsl

* build: Micronaut Security M1

* build: Micronaut Test M1

* Apache Groovy 4.0.11

* testcontainers 1.18.0

* enable binary compatibility
  • Loading branch information
sdelamo authored Apr 12, 2023
1 parent 76d14ef commit 51add3e
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
9 changes: 0 additions & 9 deletions elasticsearch-bom/build.gradle

This file was deleted.

3 changes: 3 additions & 0 deletions elasticsearch-bom/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id("io.micronaut.build.internal.bom")
}
10 changes: 7 additions & 3 deletions elasticsearch/build.gradle → elasticsearch/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'io.micronaut.build.internal.elasticsearch-module'
id("io.micronaut.build.internal.elasticsearch-module")
}

dependencies {
Expand All @@ -20,6 +20,10 @@ dependencies {
testImplementation(mn.reactor)
}

tasks.named('test') {
systemProperty 'elasticsearch.version', libs.versions.managed.elasticsearch.get()

tasks {
named<Test>("test") {
systemProperty("elasticsearch.version", libs.versions.managed.elasticsearch.get())
}
}

6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
micronaut-docs = "2.0.0"
micronaut = "4.0.0-M1"

micronaut-security = "4.0.0-SNAPSHOT"
micronaut-test = "4.0.0-SNAPSHOT"
micronaut-security = "4.0.0-M1"
micronaut-test = "4.0.0-M1"

managed-elasticsearch = "7.16.3"

graal-svm = "22.3.1"
groovy = "4.0.9"
groovy = "4.0.11"
spock = "2.3-groovy-4.0"
testcontainers = "1.18.0"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id 'groovy'
id 'io.micronaut.build.internal.elasticsearch-tests'
id("groovy")
id("io.micronaut.build.internal.elasticsearch-tests")
}

dependencies {
testCompileOnly mn.micronaut.inject.groovy
testCompileOnly(mn.micronaut.inject.groovy)

testImplementation(platform(mn.micronaut.core.bom))
testImplementation(mnTest.micronaut.test.spock)
Expand All @@ -17,12 +17,14 @@ dependencies {
testRuntimeOnly(mn.logback.classic)
}

tasks.named('test') {
useJUnitPlatform()
systemProperty 'elasticsearch.version', libs.versions.managed.elasticsearch.get()
tasks {
named<Test>("test") {
useJUnitPlatform()
systemProperty("elasticsearch.version", libs.versions.managed.elasticsearch.get())
}
}

java {
sourceCompatibility = JavaVersion.toVersion('17')
targetCompatibility = JavaVersion.toVersion('17')
sourceCompatibility = JavaVersion.toVersion("17")
targetCompatibility = JavaVersion.toVersion("17")
}

0 comments on commit 51add3e

Please sign in to comment.