Update jooq plugin and java version

mattupstate · mattupstate · commit 7f0cfe539690 · 2022-11-19T19:39:18.000-05:00
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
       - uses: gradle/gradle-build-action@v2
         with:
           arguments: test
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1,4 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
 java=17.0.2-open
-gradle=7.4.2
+gradle=7.5.1
diff --git a/acme-data/acme-data-sql/build.gradle.kts b/acme-data/acme-data-sql/build.gradle.kts
@@ -35,7 +35,7 @@ java {
 }
 
 jooq {
-  version.set("3.16.4")
+  version.set("3.17.4")
   edition.set(JooqEdition.OSS)
   configurations {
     create("main") {
diff --git a/acme-web/acme-web-server/src/test/kotlin/com/acme/web/server/scheduling/MessagesTest.kt b/acme-web/acme-web-server/src/test/kotlin/com/acme/web/server/scheduling/MessagesTest.kt
@@ -210,7 +210,7 @@ class MessagesTest : ShouldSpec({
         runBlocking {
           uow.transaction {
             // Given
-            val start = Instant.now()
+            val start = Instant.now().truncatedTo(ChronoUnit.MICROS)
             val end = start.plus(1, ChronoUnit.HOURS)
 
             val command = CreateAppointmentCommand(
@@ -311,7 +311,7 @@ class MessagesTest : ShouldSpec({
               uow
             )
 
-            val start = Instant.now()
+            val start = Instant.now().truncatedTo(ChronoUnit.MICROS)
             val end = start.plus(1, ChronoUnit.HOURS)
 
             // When
@@ -406,7 +406,7 @@ class MessagesTest : ShouldSpec({
                 uow
               )
 
-              val start = Instant.now()
+              val start = Instant.now().truncatedTo(ChronoUnit.MICROS)
               val end = start.plus(1, ChronoUnit.HOURS)
 
               schedulingMessageBus.handle(
@@ -509,7 +509,7 @@ class MessagesTest : ShouldSpec({
                 uow
               )
 
-              val start = Instant.now()
+              val start = Instant.now().truncatedTo(ChronoUnit.MICROS)
               val end = start.plus(1, ChronoUnit.HOURS)
 
               schedulingMessageBus.handle(
@@ -612,7 +612,7 @@ class MessagesTest : ShouldSpec({
                 uow
               )
 
-              val start = Instant.now()
+              val start = Instant.now().truncatedTo(ChronoUnit.MICROS)
               val end = start.plus(1, ChronoUnit.HOURS)
 
               schedulingMessageBus.handle(
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,6 +15,6 @@ dependencies {
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
diff --git a/buildSrc/src/main/kotlin/acme.kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/acme.kotlin-conventions.gradle.kts
@@ -14,8 +14,8 @@ group = "com.acme"
 version = "0.1.0"
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_11
-  targetCompatibility = JavaVersion.VERSION_11
+  sourceCompatibility = JavaVersion.VERSION_17
+  targetCompatibility = JavaVersion.VERSION_17
 }
 
 jacoco {
@@ -49,7 +49,7 @@ tasks {
 
   withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
     kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.toString()
+      jvmTarget = JavaVersion.VERSION_17.toString()
       freeCompilerArgs = listOf(
         "-Xemit-jvm-type-annotations",  // NOTE: necessary for validation annotations to work. Such as: `val things: List<@NotBlank String>`
         "-opt-in=kotlin.RequiresOptIn",
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ io-jaegertracing = "1.2.0"
 io-ktor = "2.0.0"
 io-opentelemetry = "1.15.0"
 kotlin = "1.6.21"
-org-jooq = "3.16.4"
+org-jooq = "3.17.4"
 org-junit-jupiter = "5.8.2"
 org-seleniumhq-selenium = "4.3.0"
 
@@ -91,5 +91,5 @@ com-github-ben-manes-versions = "com.github.ben-manes.versions:0.44.0"
 com-google-cloud-tools-jib = "com.google.cloud.tools.jib:3.2.1"
 com-ryandens-javaagent-jib = "com.ryandens.javaagent-jib:0.3.2"
 nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.7.0"
-nu-studer-jooq = "nu.studer.jooq:7.1.1"
+nu-studer-jooq = "nu.studer.jooq:8.0"
 org-hidetake-swagger-generator = "org.hidetake.swagger.generator:2.18.2"

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ java {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`jooq {`
`38`		`- version.set("3.16.4")`
	`38`	`+ version.set("3.17.4")`
`39`	`39`	`edition.set(JooqEdition.OSS)`
`40`	`40`	`configurations {`
`41`	`41`	`create("main") {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ dependencies {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`java {`
`18`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`19`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`18`	`+ sourceCompatibility = JavaVersion.VERSION_17`
	`19`	`+ targetCompatibility = JavaVersion.VERSION_17`
`20`	`20`	`}`