diff --git a/.circleci/config.yml b/.circleci/config.yml index 48c94abd3..a5588f5de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -138,9 +138,12 @@ jobs: - querydsl-dependencies-{{ checksum "pom.xml" }} - querydsl-dependencies- - run: - name: 'Test' + name: 'Prepare environment' command: | ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-sql-spring,:querydsl-jpa-spring,:querydsl-kotlin-codegen,:querydsl-mongodb,:querydsl-r2dbc,:querydsl-sql-json -am -T2 + - run: + name: 'Build and test examples' + command: | ./mvnw -ntp -B verify -Pexamples -rf :querydsl-examples - save-test-results buildQuarkusExample: @@ -157,6 +160,23 @@ jobs: command: | cp querydsl-examples/querydsl-example-jpa-quarkus/Dockerfile . docker build --progress=plain . + buildKotlinKspExample: + <<: *defaults + working_directory: ~/querydsl + docker: + - image: velo/toolchains-4-ci-builds:with-docker + steps: + - checkout + - run: + name: 'Prepare environment' + command: | + ./mvnw -N org.codehaus.mojo:properties-maven-plugin:1.2.1:write-project-properties -Dproperties.outputFile=querydsl-examples/querydsl-example-ksp-codegen/gradle.properties + ./mvnw -ntp -B install -Pquickbuild -pl :querydsl-ksp-codegen,:querydsl-jpa -am -T2 + - run: + name: 'Build and test examples' + command: | + cd querydsl-examples/querydsl-example-ksp-codegen + ./gradlew --no-daemon --console=plain test testMySQL: <<: *defaults working_directory: ~/querydsl @@ -380,7 +400,11 @@ workflows: filters: <<: *all-branches - buildQuarkusExample: - name: 'Compile and package Quarkus Example' + name: 'Compile and test Quarkus Native Example' + filters: + <<: *all-branches + - buildKotlinKspExample: + name: 'Compile and test Kotlin KSP Example' filters: <<: *all-branches - testMySQL: diff --git a/pom.xml b/pom.xml index 0ad2f25f4..886a98edd 100644 --- a/pom.xml +++ b/pom.xml @@ -131,6 +131,7 @@ 3.1.0 3.0.0 + 3.26.3 3.9.9 33.3.1-jre 0.6.8 @@ -148,6 +149,7 @@ 1.9.20 2.11.12 9.7.1 + ${project.version} * @@ -291,7 +293,7 @@ org.assertj assertj-core - 3.26.3 + ${assertj.version} test diff --git a/querydsl-examples/querydsl-example-ksp-codegen/build.gradle.kts b/querydsl-examples/querydsl-example-ksp-codegen/build.gradle.kts index a496e0deb..81a31b45d 100755 --- a/querydsl-examples/querydsl-example-ksp-codegen/build.gradle.kts +++ b/querydsl-examples/querydsl-example-ksp-codegen/build.gradle.kts @@ -2,6 +2,8 @@ val kotlinVersion = findProperty("kotlin.version") as String val jpaVersion = findProperty("jpa.version") as String val hibernateVersion = findProperty("hibernate.version") as String val h2Version = findProperty("h2.version") as String +val querydslVersion = findProperty("querydsl.version") as String +val assertjVersion = findProperty("assertj.version") as String plugins { kotlin("jvm") @@ -17,11 +19,11 @@ repositories { dependencies { implementation("jakarta.persistence:jakarta.persistence-api:${jpaVersion}") - implementation("io.github.openfeign.querydsl:querydsl-core:6.9-SNAPSHOT") - ksp("io.github.openfeign.querydsl:querydsl-ksp-codegen:6.9-SNAPSHOT") + implementation("io.github.openfeign.querydsl:querydsl-core:${querydslVersion}") + ksp("io.github.openfeign.querydsl:querydsl-ksp-codegen:${querydslVersion}") - testImplementation("io.github.openfeign.querydsl:querydsl-jpa:6.9-SNAPSHOT") - testImplementation("org.assertj:assertj-core:3.26.3") + testImplementation("io.github.openfeign.querydsl:querydsl-jpa:${querydslVersion}") + testImplementation("org.assertj:assertj-core:${assertjVersion}") testImplementation("org.hibernate.orm:hibernate-core:${hibernateVersion}") testImplementation("com.h2database:h2:${h2Version}") testImplementation("org.jetbrains.kotlin:kotlin-test-junit:${kotlinVersion}") diff --git a/querydsl-tooling/querydsl-ksp-codegen/pom.xml b/querydsl-tooling/querydsl-ksp-codegen/pom.xml index 749f6025c..e59ce506c 100644 --- a/querydsl-tooling/querydsl-ksp-codegen/pom.xml +++ b/querydsl-tooling/querydsl-ksp-codegen/pom.xml @@ -1,8 +1,5 @@ - + 4.0.0 io.github.openfeign.querydsl