Merge pull request #431 from TheKinrar/kotlin2.1

Only support Kotlin 2.1

Author: casid

.github/workflows/maven.yml

@@ -123,14 +123,10 @@ jobs:
       - uses: ./.github/prepare-cache-action
 
   test-kotlin:
-    name: Test / Kotlin / ${{ matrix.kotlin-profile }}
+    name: Test / Kotlin
     runs-on: ubuntu-latest
     needs:
       - build
-    strategy:
-      fail-fast: false
-      matrix:
-        kotlin-profile: ["kotlin-1.9", "kotlin-2.0"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
@@ -143,8 +139,8 @@ jobs:
         run: chmod +x ./mvnw
       - name: Build with Maven
         run: ./mvnw install --file pom.xml -DskipTests=true
-      - name: Test Kotlin Profile ${{ matrix.kotlin-profile }}
-        run: ./mvnw test --file pom.xml --projects jte-kotlin --also-make --activate-profiles ${{ matrix.kotlin-profile }}
+      - name: Test Kotlin
+        run: ./mvnw test --file pom.xml --projects jte-kotlin --also-make
       - uses: ./.github/prepare-cache-action
 
   coverage:
@@ -170,7 +166,7 @@ jobs:
         if: contains(matrix.os, 'win') == false
         run: chmod +x ./mvnw
       - name: Build with Maven
-        run: ./mvnw verify --file pom.xml -Pcoverage,kotlin-1.9
+        run: ./mvnw verify --file pom.xml -Pcoverage
       - name: Upload coverage report
         uses: codecov/codecov-action@v4
         env:

.gitignore

@@ -15,6 +15,7 @@ buildNumber.properties
 ### Gradle ###
 build/
 .gradle/
+.kotlin/
 
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm

jte-kotlin/pom.xml

@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-compiler-embeddable</artifactId>
-            <version>${kotlin.version}</version>
+            <version>2.1.10</version>
         </dependency>
 
         <dependency>
@@ -47,23 +47,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>kotlin-1.9</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <kotlin.version>1.9.10</kotlin.version>
-            </properties>
-        </profile>
-        <profile>
-            <id>kotlin-2.0</id>
-            <properties>
-                <kotlin.version>2.0.20</kotlin.version>
-            </properties>
-        </profile>
-    </profiles>
-
 </project>

test/gradle-test-wrapper/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

test/gradle-test-wrapper/gradle/wrapper/gradle-wrapper.properties

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

test/gradle-test-wrapper/gradlew

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.10"
+    kotlin("jvm") version "2.1.10"
     id("gg.jte.gradle") version("3.1.17-SNAPSHOT")
 }
 

test/jte-runtime-cp-test-gradle-kotlin-convention/build.gradle.kts

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

test/jte-runtime-cp-test-gradle-kotlin-convention/gradle/wrapper/gradle-wrapper.jar

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac