Skip to content

Commit ea112d9

Browse files
committed
Undo changes
1 parent aeaa3b9 commit ea112d9

1 file changed

Lines changed: 27 additions & 25 deletions

File tree

jooq/build.gradle.kts

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
import nu.studer.gradle.jooq.JooqEdition
2+
import org.jooq.meta.kotlin.*
3+
14
plugins {
25
java
36
id("org.springframework.boot") version "3.5.4"
47
id("io.spring.dependency-management") version "1.1.7"
5-
id("org.jooq.jooq-codegen-gradle") version "3.20.5"
8+
id("nu.studer.jooq") version "10.1.1"
69
}
710

811
group = "zin.rashidi.boot"
@@ -20,8 +23,8 @@ repositories {
2023

2124
dependencies {
2225
implementation("org.springframework.boot:spring-boot-starter-jooq")
23-
jooqCodegen("org.jooq:jooq-meta-extensions")
24-
jooqCodegen("com.mysql:mysql-connector-j")
26+
jooqGenerator("org.jooq:jooq-meta-extensions")
27+
jooqGenerator("com.mysql:mysql-connector-j")
2528
runtimeOnly("com.mysql:mysql-connector-j")
2629
testImplementation("org.springframework.boot:spring-boot-starter-test")
2730
testImplementation("org.springframework.boot:spring-boot-testcontainers")
@@ -39,32 +42,31 @@ tasks.named<Test>("test") {
3942
useJUnitPlatform()
4043
}
4144

42-
sourceSets {
43-
main {
44-
java {
45-
srcDir("build/generated-src/jooq/main")
46-
}
47-
}
48-
}
49-
5045
jooq {
51-
configuration {
52-
generator {
53-
database {
54-
name = "org.jooq.meta.extensions.ddl.DDLDatabase"
55-
properties {
56-
property {
57-
key = "scripts"
58-
value = "src/main/resources/mysql-schema.sql"
46+
version.set(dependencyManagement.importedProperties["jooq.version"])
47+
edition.set(JooqEdition.OSS)
48+
49+
configurations {
50+
create("main") {
51+
52+
jooqConfiguration {
53+
generator {
54+
database {
55+
name = "org.jooq.meta.extensions.ddl.DDLDatabase"
56+
properties {
57+
property {
58+
key = "scripts"
59+
value = "src/main/resources/mysql-schema.sql"
60+
}
61+
}
62+
}
63+
target {
64+
packageName = "zin.rashidi.boot.jooq"
5965
}
66+
strategy.name = "org.jooq.codegen.DefaultGeneratorStrategy"
6067
}
6168
}
62-
target {
63-
packageName = "zin.rashidi.boot.jooq"
64-
}
65-
strategy {
66-
name = "org.jooq.codegen.DefaultGeneratorStrategy"
67-
}
69+
6870
}
6971
}
7072
}

0 commit comments

Comments
 (0)