Upgrade kotlin to version 2.0.0

Osguima3 · Sep 5, 2024 · 9718de0 · 9718de0
1 parent e94a811
commit 9718de0
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,14 +7,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           cache: maven
           distribution: adopt
           java-version: 17
 
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
       - name: Build project
         run: mvn -B clean compile verify
diff --git a/jooqdsl-maven-plugin/pom.xml b/jooqdsl-maven-plugin/pom.xml
@@ -16,6 +16,7 @@
 
     <properties>
         <skipJooq>false</skipJooq>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <maven-invoker-plugin.version>3.8.0</maven-invoker-plugin.version>
     </properties>
 
@@ -28,8 +29,9 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-script-util</artifactId>
+            <artifactId>kotlin-scripting-jsr223</artifactId>
             <version>${kotlin.version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -61,19 +63,19 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
-            <version>${maven-plugin.version}</version>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>${maven-plugin.version}</version>
+            <version>${maven.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>${maven-plugin.version}</version>
+            <version>${maven-plugin-plugin.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -136,7 +138,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-compat</artifactId>
-            <version>${maven-plugin.version}</version>
+            <version>${maven.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -190,7 +192,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>${maven-plugin.version}</version>
+                <version>${maven-plugin-plugin.version}</version>
                 <configuration>
                     <goalPrefix>jooqdsl</goalPrefix>
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>

diff --git a/jooqdsl-maven-plugin/src/it/multi-module/app/pom.xml b/jooqdsl-maven-plugin/src/it/multi-module/app/pom.xml
@@ -30,11 +30,6 @@
             <artifactId>multimodule-model</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -119,7 +114,7 @@
                     </additionalSources>
                     <container>
                         <provider>org.testcontainers.containers.PostgreSQLContainerProvider</provider>
-                        <version>10.3</version>
+                        <version>${postgresql-engine.version}</version>
                         <migrationPath>src/main/resources/db/migration</migrationPath>
                     </container>
                 </configuration>

diff --git a/jooqdsl-maven-plugin/src/it/multi-module/pom.xml b/jooqdsl-maven-plugin/src/it/multi-module/pom.xml
@@ -23,20 +23,21 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <kotlin.code.style>official</kotlin.code.style>
 
-        <kotlin.version>1.8.0</kotlin.version>
-        <jackson.version>2.15.2</jackson.version>
+        <kotlin.version>2.0.0</kotlin.version>
+        <jackson.version>2.17.1</jackson.version>
 
         <!-- Database -->
         <postgresql.version>42.3.9</postgresql.version>
+        <postgresql-engine.version>10.3</postgresql-engine.version>
         <testcontainers.version>1.20.1</testcontainers.version>
         <jooqdsl.version>@project.version@</jooqdsl.version>
 
         <!-- Test dependencies -->
-        <junit-jupiter.version>5.10.0</junit-jupiter.version>
-        <assertj.version>3.24.2</assertj.version>
+        <junit-jupiter.version>5.10.2</junit-jupiter.version>
+        <assertj.version>3.26.0</assertj.version>
 
         <!-- Plugins -->
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
     </properties>
 
     <dependencyManagement>

diff --git a/jooqdsl-maven-plugin/src/it/simple-java/pom.xml b/jooqdsl-maven-plugin/src/it/simple-java/pom.xml
@@ -18,7 +18,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <!-- Database -->
-        <postgresql.version>42.6.1</postgresql.version>
+        <postgresql.version>42.7.3</postgresql.version>
         <postgresql-engine.version>10.3</postgresql-engine.version>
         <testcontainers.version>1.20.1</testcontainers.version>
         <jooqdsl.version>@project.version@</jooqdsl.version>

diff --git a/...ugin/src/main/kotlin/io/github/osguima3/jooqdsl/plugin/configuration/AdditionalSources.kt b/...ugin/src/main/kotlin/io/github/osguima3/jooqdsl/plugin/configuration/AdditionalSources.kt
@@ -49,9 +49,7 @@ private fun precompileKotlin(sources: AdditionalSources, environment: ExecutionE
         goal("compile"),
         configuration(
             element("jvmTarget", environment.mavenProject.properties.getProperty("maven.compiler.target", "17")),
-            element("sourceDirs", *sources
-                .map { element("sourceDir", it) }
-                .toTypedArray())
+            element("sourceDirs", *sources.map { element("sourceDir", it) }.toTypedArray())
         ),
         environment
     )
@@ -62,7 +60,7 @@ private fun precompileJava(sources: AdditionalSources, environment: ExecutionEnv
         plugin(
             groupId("org.apache.maven.plugins"),
             artifactId("maven-compiler-plugin"),
-            version("3.11.0")
+            version("3.13.0")
         ),
         goal("compile"),
         configuration(

diff --git a/...aven-plugin/src/main/kotlin/io/github/osguima3/jooqdsl/plugin/mojo/JooqDslGenerateMojo.kt b/...aven-plugin/src/main/kotlin/io/github/osguima3/jooqdsl/plugin/mojo/JooqDslGenerateMojo.kt
@@ -135,6 +135,7 @@ class JooqDslGenerateMojo : AbstractMojo() {
         try {
             map { File(project.basedir, it) }.forEach { log.info("Precompiling sources from $it") }
             precompile(executionEnvironment(project, session, pluginManager))
+            log.info("Sources precompiled successfully!")
         } catch (e: MojoExecutionException) {
             log.error(e)
             throw MojoExecutionException("Could not precompile sources. Make sure all dependencies are included", e)

diff --git a/jooqdsl-maven-plugin/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/jooqdsl-maven-plugin/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
@@ -1 +1 @@
-org.jetbrains.kotlin.script.jsr223.KotlinJsr223JvmLocalScriptEngineFactory
+kotlin.script.experimental.jsr223.KotlinJsr223DefaultScriptEngineFactory
diff --git a/pom.xml b/pom.xml
@@ -41,11 +41,11 @@
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
 
         <java.version>17</java.version>
-        <kotlin.version>1.8.0</kotlin.version>
+        <kotlin.version>2.0.0</kotlin.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
-        <maven-plugin.version>3.9.0</maven-plugin.version>
+        <maven.version>3.9.8</maven.version>
         <mojo-executor.version>2.4.0</mojo-executor.version>
         <jakarta-xml.version>4.0.2</jakarta-xml.version>
         <jooq.version>3.19.11</jooq.version>
@@ -58,6 +58,7 @@
         <jackson.version>2.17.2</jackson.version>
 
         <!-- Plugins -->
+        <maven-plugin-plugin.version>3.13.1</maven-plugin-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
         <maven-gpg-plugin.version>3.2.5</maven-gpg-plugin.version>
@@ -152,7 +153,7 @@
                                 <goal>javadocJar</goal>
                             </goals>
                             <configuration>
-                                <jdkVersion>${java.version}</jdkVersion>
+                                <jdkVersion>${maven.compiler.source}</jdkVersion>
                             </configuration>
                         </execution>
                     </executions>