diff --git a/build.gradle b/build.gradle index 552fbc25..0f5aad48 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,11 @@ plugins { alias(libs.plugins.kotlin.jvm) apply false } +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} + tasks.named("dokkaHtmlMultiModule") { outputDirectory.set(rootProject.layout.buildDirectory.dir("docs/api").map(d -> d.asFile)) } diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.kotlin-base.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.kotlin-base.gradle new file mode 100644 index 00000000..bc53d98d --- /dev/null +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.kotlin-base.gradle @@ -0,0 +1,10 @@ +plugins { + id("org.jetbrains.kotlin.jvm") + id("org.jetbrains.dokka") + id("org.jetbrains.kotlin.kapt") +} + +repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } +} diff --git a/buildSrc/src/main/groovy/io.micronaut.build.internal.kotlin-module.gradle b/buildSrc/src/main/groovy/io.micronaut.build.internal.kotlin-module.gradle new file mode 100644 index 00000000..6ed8f8aa --- /dev/null +++ b/buildSrc/src/main/groovy/io.micronaut.build.internal.kotlin-module.gradle @@ -0,0 +1,4 @@ +plugins { + id "io.micronaut.build.internal.kotlin-base" + id "io.micronaut.build.internal.module" +} diff --git a/buildSrc/src/main/groovy/micronaut-kotlin.module-conventions.gradle b/buildSrc/src/main/groovy/micronaut-kotlin.module-conventions.gradle deleted file mode 100644 index 548c7621..00000000 --- a/buildSrc/src/main/groovy/micronaut-kotlin.module-conventions.gradle +++ /dev/null @@ -1,6 +0,0 @@ -plugins { - id("io.micronaut.build.internal.module") - id("org.jetbrains.kotlin.jvm") - id("org.jetbrains.dokka") - id("org.jetbrains.kotlin.kapt") -} diff --git a/examples/greeting/build.gradle b/examples/greeting/build.gradle index 4fdc9515..1613bd28 100644 --- a/examples/greeting/build.gradle +++ b/examples/greeting/build.gradle @@ -7,6 +7,7 @@ plugins { repositories { mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } } mainClassName = 'app.ApplicationKt' diff --git a/gradle.properties b/gradle.properties index ab0aaab9..a6e77e77 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ -projectVersion=3.3.0-SNAPSHOT +projectVersion=4.0.0-SNAPSHOT projectGroup=io.micronaut.kotlin micronautDocsVersion=2.0.0 -micronautVersion=3.6.1 +micronautVersion=4.0.0-SNAPSHOT micronautTestVersion=3.5.0 -groovyVersion=3.0.10 +groovyVersion=3.0.12 spockVersion=2.1-groovy-3.0 title=Micronaut Kotlin Integrations @@ -13,8 +13,7 @@ projectUrl=https://micronaut.io githubSlug=micronaut-projects/micronaut-kotlin developers=Graeme Rocher -githubCoreBranch=3.7.x - +githubCoreBranch=4.0.x bomProperty=micronautKotlinVersion org.gradle.caching=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b07a7af2..4918cfdd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,8 +5,9 @@ ktor = "1.6.8" logback-classic = "1.2.11" mockito-core = "4.4.0" mockito-junit-jupiter = "4.4.0" + mockito-kotlin = "2.2.0" -kotlin = "1.6.10" +kotlin = "1.7.10" [libraries] typesafe-config = { module = "com.typesafe:config", version.ref = "typesafe-config" } diff --git a/kotlin-extension-functions/build.gradle b/kotlin-extension-functions/build.gradle index 8a755a64..577e4d9f 100644 --- a/kotlin-extension-functions/build.gradle +++ b/kotlin-extension-functions/build.gradle @@ -1,5 +1,5 @@ plugins { - id("micronaut-kotlin.module-conventions") + id("io.micronaut.build.internal.kotlin-module") } sourceCompatibility = 1.8 diff --git a/kotlin-extension-functions/src/test/kotlin/io/micronaut/kotlin/inject/QualifiersExtensionsTest.kt b/kotlin-extension-functions/src/test/kotlin/io/micronaut/kotlin/inject/QualifiersExtensionsTest.kt index 498f199c..478bfcb5 100644 --- a/kotlin-extension-functions/src/test/kotlin/io/micronaut/kotlin/inject/QualifiersExtensionsTest.kt +++ b/kotlin-extension-functions/src/test/kotlin/io/micronaut/kotlin/inject/QualifiersExtensionsTest.kt @@ -16,7 +16,7 @@ class QualifiersExtensionsTest { fun qualifierByStereotype() { // given // when - val result = io.micronaut.kotlin.inject.qualifierByStereotype() + val result = qualifierByStereotype() // then assertEquals(result::class, Qualifiers.byStereotype(Context::class.java)::class) } diff --git a/kotlin-runtime/build.gradle b/kotlin-runtime/build.gradle index dccf3df1..16badf58 100644 --- a/kotlin-runtime/build.gradle +++ b/kotlin-runtime/build.gradle @@ -1,5 +1,5 @@ plugins { - id("micronaut-kotlin.module-conventions") + id("io.micronaut.build.internal.kotlin-module") } sourceCompatibility = 1.8 diff --git a/kotlin-runtime/src/main/kotlin/io/micronaut/jackson/kotlin/KotlinModuleFactory.kt b/kotlin-runtime/src/main/kotlin/io/micronaut/jackson/kotlin/KotlinModuleFactory.kt index b602f859..dfebe11b 100644 --- a/kotlin-runtime/src/main/kotlin/io/micronaut/jackson/kotlin/KotlinModuleFactory.kt +++ b/kotlin-runtime/src/main/kotlin/io/micronaut/jackson/kotlin/KotlinModuleFactory.kt @@ -32,6 +32,6 @@ class KotlinModuleFactory { @Requires(property = "jackson.module-scan", value = "false") @Singleton fun kotlinModuleFactory() : KotlinModule { - return KotlinModule() + return KotlinModule.Builder().build() } } diff --git a/ktor/build.gradle b/ktor/build.gradle index a6173e52..554e88c1 100644 --- a/ktor/build.gradle +++ b/ktor/build.gradle @@ -1,5 +1,5 @@ plugins { - id("micronaut-kotlin.module-conventions") + id("io.micronaut.build.internal.kotlin-module") } sourceCompatibility = 1.8 diff --git a/settings.gradle b/settings.gradle index 6ee675fb..3e4b1abd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,3 +20,10 @@ include "examples:greeting" micronautBuild { importMicronautCatalog() } + +dependencyResolutionManagement { + repositories { + mavenCentral() + maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" } + } +}