Merge pull request #194 from Z-Jais/master

Update dependencies and enable K2 Compiler
Z-Jais · Oct 31, 2023 · 70e63cf · 70e63cf
2 parents ff73e3b + 7466160
commit 70e63cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 40 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -40,42 +40,6 @@ jobs:
       - name: Build
         run: mvn -B package -DskipTests
 
-  sonar:
-    if: github.ref == 'refs/heads/master'
-    name: Sonarqube
-    runs-on: ubuntu-latest
-
-    needs:
-      - test
-
-    permissions: read-all
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: 'adopt'
-      - name: Cache SonarQube packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Build and analyze
-        env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=jais-api -Dsonar.projectName='jais-api'
-
   docker:
     runs-on: ubuntu-latest
 

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,8 @@
     <properties>
         <ktor_version>2.3.5</ktor_version>
         <kotlin.code.style>official</kotlin.code.style>
-        <kotlin.version>1.9.10</kotlin.version>
+        <kotlin.version>1.9.20</kotlin.version>
+        <kotlin.compiler.languageVersion>2.0</kotlin.compiler.languageVersion>
         <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
         <logback_version>1.4.11</logback_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -189,11 +190,11 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.1</version>
             </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.2.1</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -243,7 +244,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.10</version>
+                <version>0.8.11</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>