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

ci: version to 4.0.0 Micronaut 4.0.0-SNAPSHOT githubCoreBranch=4.0.x #422

Merged
merged 10 commits into from Sep 13, 2022
5 changes: 5 additions & 0 deletions build.gradle
Expand Up @@ -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))
}
Expand Down
@@ -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/" }
}
@@ -0,0 +1,4 @@
plugins {
id "io.micronaut.build.internal.kotlin-base"
id "io.micronaut.build.internal.module"
}

This file was deleted.

1 change: 1 addition & 0 deletions examples/greeting/build.gradle
Expand Up @@ -7,6 +7,7 @@ plugins {

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

mainClassName = 'app.ApplicationKt'
Expand Down
9 changes: 4 additions & 5 deletions 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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion gradle/libs.versions.toml
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
Expand Up @@ -16,7 +16,7 @@ class QualifiersExtensionsTest {
fun qualifierByStereotype() {
// given
// when
val result = io.micronaut.kotlin.inject.qualifierByStereotype<Any, Context>()
val result = qualifierByStereotype<Any, Context>()
// then
assertEquals(result::class, Qualifiers.byStereotype<Any>(Context::class.java)::class)
}
Expand Down
2 changes: 1 addition & 1 deletion kotlin-runtime/build.gradle
@@ -1,5 +1,5 @@
plugins {
id("micronaut-kotlin.module-conventions")
id("io.micronaut.build.internal.kotlin-module")
}

sourceCompatibility = 1.8
Expand Down
Expand Up @@ -32,6 +32,6 @@ class KotlinModuleFactory {
@Requires(property = "jackson.module-scan", value = "false")
@Singleton
fun kotlinModuleFactory() : KotlinModule {
return KotlinModule()
return KotlinModule.Builder().build()
}
}
2 changes: 1 addition & 1 deletion ktor/build.gradle
@@ -1,5 +1,5 @@
plugins {
id("micronaut-kotlin.module-conventions")
id("io.micronaut.build.internal.kotlin-module")
}

sourceCompatibility = 1.8
Expand Down
7 changes: 7 additions & 0 deletions settings.gradle
Expand Up @@ -20,3 +20,10 @@ include "examples:greeting"
micronautBuild {
importMicronautCatalog()
}

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