Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate build plugins to 6.1.1 #224

Merged
merged 1 commit into from
Jan 4, 2023
Merged
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
6 changes: 4 additions & 2 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@
<!-- Checks for Javadoc comments. -->
<!-- See https://checkstyle.org/config_javadoc.html -->
<module name="JavadocMethod">
<property name="excludeScope" value="private"/>
<property name="accessModifiers" value="public, protected"/>
</module>
<module name="JavadocType"/>
<module name="JavadocStyle"/>
<module name="MissingJavadocType"/>
<module name="MissingJavadocType">
<property name="severity" value="warning"/>
</module>

<!-- Checks for Naming Conventions. -->
<!-- See https://checkstyle.org/config_naming.html -->
Expand Down
2 changes: 0 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ managed-paho-mqttv3-client = { module = "org.eclipse.paho:org.eclipse.paho.clien
managed-paho-mqttv5-client = { module = "org.eclipse.paho:org.eclipse.paho.mqttv5.client", version.ref = "managed-mqttv5" }

micronaut-serde = { module = "io.micronaut.serde:micronaut-serde-bom", version.ref = "micronaut-serde" }
micronaut-test = { module = "io.micronaut.test:micronaut-test-bom", version.ref = "micronaut-test" }

awaitility = { module = "org.awaitility:awaitility", version.ref = "awaitility" }
bcpkix-jdk15on = { module = "org.bouncycastle:bcpkix-jdk15on", version.ref = "bcpkix-jdk15on" }
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api" }
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
reactor-core = { module = "io.projectreactor:reactor-core" }
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
testcontainers-spock = { module = "org.testcontainers:spock", version.ref = "testcontainers" }

Expand Down
2 changes: 1 addition & 1 deletion mqtt-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ dependencies {
api(mn.micronaut.runtime)
api(mn.micronaut.messaging)
implementation(mnSerde.micronaut.serde.jackson)
implementation(libs.reactor.core)
implementation(mn.reactor)
compileOnly(libs.kotlin.stdlib.jdk8)
}
6 changes: 3 additions & 3 deletions mqttv3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ plugins {

dependencies {
api(libs.managed.paho.mqttv3.client)
api project(":mqtt-core")
api projects.mqttCore
compileOnly(mn.micronaut.management)
testImplementation(mn.micronaut.management)
testImplementation(libs.reactor.core)
testImplementation(project(":test-suite-utils"))
testImplementation(mn.reactor)
testImplementation(projects.testSuiteUtils)
}
2 changes: 1 addition & 1 deletion mqttv5/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ dependencies {
api projects.mqttCore
compileOnly(mn.micronaut.management)
testImplementation(mn.micronaut.management)
testImplementation(libs.reactor.core)
testImplementation(mn.reactor)
testImplementation(projects.testSuiteUtils)
}
10 changes: 1 addition & 9 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pluginManagement {
}

plugins {
id("io.micronaut.build.shared.settings") version "6.1.0"
id("io.micronaut.build.shared.settings") version "6.1.1"
}

enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
Expand All @@ -23,16 +23,8 @@ include 'test-suite-groovy'
include 'test-suite'
include 'test-suite-kotlin'

dependencyResolutionManagement {
repositories {
mavenCentral()
maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
}
}

micronautBuild {
addSnapshotRepository()
importMicronautCatalog()
importMicronautCatalog("micronaut-serde")
importMicronautCatalog("micronaut-test")
}
5 changes: 0 additions & 5 deletions test-suite-groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,3 @@ dependencies {
tasks.named('test') {
useJUnitPlatform()
}

java {
sourceCompatibility = JavaVersion.toVersion("17")
targetCompatibility = JavaVersion.toVersion("17")
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ class ProductInfo {

private String size
private Long count
private Boolean sealed
private Boolean seal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did we need to rename this?


ProductInfo(@Nullable String size, // <1>
@NonNull Long count, // <2>
@NonNull Boolean sealed) { // <3>
@NonNull Boolean seal) { // <3>
this.size = size
this.count = count
this.sealed = sealed
this.seal = seal
}

String getSize() {
Expand All @@ -27,7 +27,7 @@ class ProductInfo {
}

Boolean getSealed() {
sealed
seal
}
}
// end::clazz[]
5 changes: 0 additions & 5 deletions test-suite-kotlin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,3 @@ compileTestKotlin {
javaParameters = true
}
}

java {
sourceCompatibility = JavaVersion.toVersion("17")
targetCompatibility = JavaVersion.toVersion("17")
}
5 changes: 0 additions & 5 deletions test-suite-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,3 @@ dependencies {
api projects.mqttCore
api(libs.testcontainers.spock)
}

java {
sourceCompatibility = JavaVersion.toVersion("17")
targetCompatibility = JavaVersion.toVersion("17")
}
5 changes: 0 additions & 5 deletions test-suite/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,3 @@ dependencies {
tasks.named('test') {
useJUnitPlatform()
}

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