Add checks for generic types and discard any unexpected types

.gitattributes

@@ -6,6 +6,7 @@
 # The above will handle all files NOT found below
 #
 # These files are text and should be normalized (Convert crlf => lf)
+*.bat text eol=crlf
 *.css           text
 *.df            text
 *.htm           text

.github/workflows/build.yml

@@ -4,29 +4,30 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [11, 17, 19]
-    runs-on: ubuntu-22.04
+        java: [17, 21]
+    runs-on: ubuntu-24.04
     container:
       image: eclipse-temurin:${{ matrix.java }}
       options: --user root
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: ${{ github.repository_owner != 'Vineflower' || !(contains(github.ref_name, 'develop') || contains(github.ref_name, 'master')) }}
       - name: Build with Gradle
         run: |
-         chmod +x gradlew
          ./gradlew build --stacktrace
       - name: Archive test results
         if: "${{ always() }}"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "test-results-java${{ matrix.java }}"
           path: |
             build/reports/
             plugins/*/build/reports/
             build/test-results/**/*.xml
   publish-test-results:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [build]
     permissions:
       issues: write
@@ -35,7 +36,7 @@ jobs:
     if: success() || failure()
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
       - name: Publish Test Results

.github/workflows/release.yml

@@ -6,13 +6,15 @@ on:
       - '*'
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: eclipse-temurin:17
       options: --user root
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
       - run: ./gradlew build publish publishToSonatype closeAndReleaseSonatypeStagingRepository -x test --stacktrace
         env:
           SIGNING_KEY: ${{ secrets.SIGNING_KEY }}

.github/workflows/snapshot.yml

@@ -3,13 +3,15 @@ on: [push, pull_request]
 jobs:
   publish:
     if: ${{ github.repository_owner == 'Vineflower' && contains(github.ref_name, 'develop') }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: eclipse-temurin:17
       options: --user root
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
       - run: ./gradlew publish --stacktrace
         env:
           STATUS: snapshot

build.gradle

@@ -5,9 +5,9 @@ import org.vineflower.build.TestDataRuntimesProvider
 
 plugins {
   id 'jacoco'
-  id 'com.github.johnrengelman.shadow' version '8.1.1'
-  id 'org.jetbrains.kotlin.jvm' version '1.6.21'
-  id("io.github.gradle-nexus.publish-plugin") version '1.3.0'
+  id 'com.gradleup.shadow' version '8.3.0'
+  id 'org.jetbrains.kotlin.jvm' version '2.0.0'
+  id("io.github.gradle-nexus.publish-plugin") version '2.0.0'
 }
 
 apply plugin: 'jacoco'
@@ -18,19 +18,19 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 allprojects {
-  apply plugin: 'com.github.johnrengelman.shadow'
+  apply plugin: 'com.gradleup.shadow'
   apply plugin: 'java'
   ext.isArm = System.getProperty('os.arch') == 'aarch64'
 
   group = 'org.vineflower'
 
   compileJava {
-    sourceCompatibility = '11'
-    targetCompatibility = '11'
+    sourceCompatibility = '17'
+    targetCompatibility = '17'
   }
 
   java.toolchain {
-    languageVersion = JavaLanguageVersion.of(11)
+    languageVersion = JavaLanguageVersion.of(17)
   }
 
   repositories {
@@ -54,9 +54,9 @@ allprojects {
 }
 
 group = 'org.vineflower'
-archivesBaseName = 'vineflower'
+base.archivesName = 'vineflower'
 
-version = '1.10.0'
+version = '1.11.0'
 
 def ENV = System.getenv()
 version = version + (ENV.GITHUB_ACTIONS ? "" : "+local")
@@ -144,7 +144,7 @@ def testJavaRuntimes = [:]
         languageVersion = JavaLanguageVersion.of(runtimeVersion)
     }
 }
-[16, 17, 19, 21].forEach { version -> createJavaTestDataSet(version, "Preview", ["--enable-preview"]) }
+[16, 17, 21].forEach { version -> createJavaTestDataSet(version, "Preview", ["--enable-preview"]) }
 [8, 16].forEach { version -> createJavaTestDataSet(version, "NoDebug", ["-g:none"])}
 
 task compileTestDataJasm(type: JasmCompile) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -145,15 +148,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=SC2039,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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +205,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

plugins/idea-not-null/build.gradle

@@ -1,4 +1,4 @@
-archivesBaseName = 'vineflower-idea-not-null'
+base.archivesName = 'vineflower-idea-not-null'
 
 dependencies {
   implementation project(":")

plugins/idea-not-null/src/main/java/org/vineflower/ideanotnull/IdeaNotNullOptions.java

@@ -1,13 +1,14 @@
 package org.vineflower.ideanotnull;
 
+import org.jetbrains.java.decompiler.api.DecompilerOption;
 import org.jetbrains.java.decompiler.api.plugin.PluginOptions;
 import org.jetbrains.java.decompiler.main.extern.IFernflowerPreferences;
 
 public interface IdeaNotNullOptions {
   @IFernflowerPreferences.Name("Resugar Intellij IDEA @NotNull")
   @IFernflowerPreferences.Description("Resugar Intellij IDEA's code generated by @NotNull annotations.")
   @IFernflowerPreferences.ShortName("inn")
-  @IFernflowerPreferences.Type(IFernflowerPreferences.Type.BOOLEAN)
+  @IFernflowerPreferences.Type(DecompilerOption.Type.BOOLEAN)
   String IDEA_NOT_NULL_ANNOTATION = "resugar-idea-notnull";
 
   static void addDefaults(PluginOptions.AddDefaults cons) {

plugins/idea-not-null/testData/results/TestIdeaNotNull.dec

@@ -76,13 +76,17 @@ class 'pkg/TestIdeaNotNull' {
       f      9
       10      10
       11      10
+      12      10
+      13      10
       14      11
       1d      11
       1e      13
       1f      13
       20      13
       21      13
       22      13
+      23      13
+      24      13
       2c      14
       30      14
       34      14
@@ -145,11 +149,15 @@ class 'pkg/TestIdeaNotNull' {
       2a      33
       2b      33
       2c      33
+      2d      33
+      2e      33
       2f      34
       30      34
       31      34
       32      34
       33      34
+      34      34
+      35      34
       36      36
    }
 
@@ -168,6 +176,8 @@ class 'pkg/TestIdeaNotNull' {
       12      43
       13      43
       14      43
+      15      43
+      16      43
       1e      44
       22      44
       26      44
@@ -190,6 +200,8 @@ class 'pkg/TestIdeaNotNull' {
       e      53
       f      53
       10      53
+      11      53
+      12      53
       13      54
       1d      54
       1e      56
@@ -200,6 +212,8 @@ class 'pkg/TestIdeaNotNull' {
       23      56
       24      56
       25      56
+      26      56
+      27      56
       2f      57
       33      57
       37      57

plugins/kotlin/.gitignore

@@ -1,4 +1,5 @@
 /build/
 /out/
 /testData/classes/kt/
+/testData/classes/ktold/
 bin

plugins/kotlin/build.gradle

@@ -3,16 +3,21 @@ plugins {
   id 'org.jetbrains.kotlin.jvm'
 }
 
-apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'com.gradleup.shadow'
 apply plugin: 'java'
 apply plugin: 'maven-publish'
 
 group = 'org.vineflower'
 version = "0.1.0"
-archivesBaseName = 'vineflower-kotlin'
+base.archivesName = 'vineflower-kotlin'
 
 sourceSets {
   testDataKotlin.kotlin.srcDirs files("testData/src/kt/")
+  testDataOldKotlin.kotlin.srcDirs files("testData/src/ktold/")
+}
+
+configurations {
+  testDataOldKotlinImplementation.extendsFrom testDataKotlinImplementation
 }
 
 dependencies {
@@ -35,6 +40,20 @@ compileTestDataKotlinKotlin {
 }
 testDataClasses.dependsOn(testDataKotlinClasses)
 
+compileTestDataOldKotlinKotlin {
+  destinationDirectory = file("testData/classes/ktold")
+  kotlinOptions {
+    compilerOptions {
+      freeCompilerArgs = [ // Kotlin 2.0 defaults to invokedynamic implementations. Use class implementations instead.
+        "-Xlambdas=class",
+        "-Xsam-conversions=class",
+        "-Xstring-concat=inline",
+      ]
+    }
+  }
+}
+testDataClasses.dependsOn(testDataOldKotlinClasses)
+
 jar {
   enabled = false
 }