Include querydsl-example-ksp-codegen in the build process

Signed-off-by: Marvin Froeder <[email protected]>
OpenFeign · Nov 4, 2024 · adc8d5d · adc8d5d
1 parent f11bfc1
commit adc8d5d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git 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
@@ -131,6 +131,7 @@
     <jpa.version>3.1.0</jpa.version>
     <jakarta.annotation.version>3.0.0</jakarta.annotation.version>
 
+    <assertj.version>3.26.3</assertj.version>
     <mvn.version>3.9.9</mvn.version>
     <guava.version>33.3.1-jre</guava.version>
     <codegen.version>0.6.8</codegen.version>
@@ -148,6 +149,7 @@
     <dokka.version>1.9.20</dokka.version>
     <scala.version>2.11.12</scala.version>
     <asm.version>9.7.1</asm.version>
+    <querydsl.version>${project.version}</querydsl.version>
 
     <!-- Import-Package definitions for maven-bundle-plugin -->
     <osgi.import.package.root>*</osgi.import.package.root>
@@ -291,7 +293,7 @@
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>3.26.3</version>
+      <version>${assertj.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git 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
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-        xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.github.openfeign.querydsl</groupId>