Skip to content

Commit

Permalink
Resolved merge conflicts as two of them worked on same file build.gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
yrlmanoharreddy committed Sep 22, 2024
1 parent 8253fac commit eb18c0b
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions pi4micronaut-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,16 @@ dependencies {
api 'com.pi4j:pi4j-core:2.4.0'
api 'com.pi4j:pi4j-plugin-raspberrypi:2.4.0'
api 'com.pi4j:pi4j-plugin-pigpio:2.4.0'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testImplementation 'org.junit.jupiter:junit-jupiter'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
testImplementation("org.mockito:mockito-core:5.+")
testImplementation(platform("org.junit:junit-bom:5.11.0"))
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")

}

test {
useJUnitPlatform()
}

java {
sourceCompatibility = JavaVersion.toVersion("17")
targetCompatibility = JavaVersion.toVersion("17")
Expand Down Expand Up @@ -175,6 +172,13 @@ publishing {
useInMemoryPgpKeys(System.getenv('GPG_KEY'), System.getenv('GPG_PASSWORD'))
sign publishing.publications.mavenJava
}
test{
useJUnitPlatform()
testLogging {
events "passed", "skipped", "failed"
}

}
}


0 comments on commit eb18c0b

Please sign in to comment.