Skip to content

Commit

Permalink
Upgrade to Micronaut 4.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
tobyhs committed Sep 22, 2024
1 parent a04a776 commit 7a1e8c7
Show file tree
Hide file tree
Showing 11 changed files with 316 additions and 293 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
submodules: true
- uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: temurin
cache: gradle
- run: ./gradlew --no-daemon --stacktrace test
32 changes: 18 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id("org.jetbrains.kotlin.jvm") version "$kotlinVersion"
id("org.jetbrains.kotlin.kapt") version "$kotlinVersion"
id("org.jetbrains.kotlin.plugin.allopen") version "$kotlinVersion"
id("com.github.johnrengelman.shadow") version "7.1.2"
id("io.micronaut.application") version "3.7.2"
id("com.google.protobuf") version "0.8.15"
id("com.google.devtools.ksp") version "1.9.25-1.0.20"
id("com.github.johnrengelman.shadow") version "8.1.1"
id("io.micronaut.application") version "4.4.2"
id("com.google.protobuf") version "0.9.2"
}

version = "0.1"
Expand All @@ -24,29 +24,29 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-reactive:$kotlinCoroutinesVersion"

implementation "io.micronaut.grpc:micronaut-grpc-runtime:3.5.0"
implementation "io.micronaut.kotlin:micronaut-kotlin-runtime:3.2.2"
implementation "io.micronaut.redis:micronaut-redis-lettuce:5.3.2"
implementation "io.micronaut.grpc:micronaut-grpc-runtime:4.+"
implementation "io.micronaut.kotlin:micronaut-kotlin-runtime:4.+"
implementation "io.micronaut.redis:micronaut-redis-lettuce:6.+"

implementation "jakarta.annotation:jakarta.annotation-api:2.1.0"
implementation "jakarta.annotation:jakarta.annotation-api:3.+"

implementation "io.grpc:grpc-kotlin-stub:$grpcKotlinVersion"

runtimeOnly "ch.qos.logback:logback-classic:1.2.11"
runtimeOnly "ch.qos.logback:logback-classic:1.+"

testImplementation "io.kotest:kotest-assertions-json-jvm:5.+"
testImplementation "io.kotest:kotest-assertions-json:5.+"

testImplementation "com.redis.testcontainers:testcontainers-redis:1.6.4"
testImplementation "org.testcontainers:testcontainers:1.18.0"
}


application {
mainClass.set("io.github.tobyhs.redisflagd.ApplicationKt")
mainClass = "io.github.tobyhs.redisflagd.ApplicationKt"
}

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

sourceSets {
Expand All @@ -60,9 +60,9 @@ sourceSets {
}

protobuf {
protoc { artifact = "com.google.protobuf:protoc:3.21.12" }
protoc { artifact = "com.google.protobuf:protoc:3.25.4" }
plugins {
grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.51.1" }
grpc { artifact = "io.grpc:protoc-gen-grpc-java:1.66.0" }
grpckt { artifact = "io.grpc:protoc-gen-grpc-kotlin:${grpcKotlinVersion}:jdk8@jar" }
}
generateProtoTasks {
Expand All @@ -80,3 +80,7 @@ micronaut {
annotations("io.github.tobyhs.redisflagd.*")
}
}

tasks.named("dockerfileNative") {
jdkVersion = "21"
}
546 changes: 287 additions & 259 deletions gradle.lockfile

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
grpcKotlinVersion=1.3.0
kotlinCoroutinesVersion=1.6.4
kotlinVersion=1.8.10
micronautVersion=3.8.5
grpcKotlinVersion=1.4.1
kotlinCoroutinesVersion=1.8.1
kotlinVersion=1.9.25
micronautVersion=4.6.2
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion micronaut-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ defaultPackage: io.github.tobyhs.redisflagd
testFramework: kotest
sourceLanguage: kotlin
buildTool: gradle
features: [annotation-api, app-name, gradle, grpc, jackson-databind, kotest, kotlin, kotlin-application, kotlin-build, logback, micronaut-build, readme, redis-lettuce, shade, yaml]
features: [app-name, discovery-core, graalvm, gradle, grpc, http-client-test, kotest, kotlin, kotlin-application, ksp, logback, micronaut-build, properties, readme, redis-lettuce, serialization-jackson, shade]

This file was deleted.

2 changes: 2 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
micronaut.application.name=redisflagd
redis.uri=redis://localhost
4 changes: 0 additions & 4 deletions src/main/resources/application.yml

This file was deleted.

1 change: 0 additions & 1 deletion src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<configuration>

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<withJansi>true</withJansi>
<!-- encoders are assigned the type
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
<encoder>
Expand Down

0 comments on commit 7a1e8c7

Please sign in to comment.