Drop support for Java 11 and modernize (#934)

Author: jupblb

.bazelrc

@@ -0,0 +1,4 @@
+common --java_language_version=17
+common --tool_java_language_version=17
+common --java_runtime_version=remotejdk_21
+common --tool_java_runtime_version=remotejdk_21

.github/workflows/nix.yaml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21]
+        java: [17, 21]
     steps:
       - uses: actions/checkout@v4
 
@@ -150,7 +150,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21]
+        java: [17, 21]
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/repos.yaml

@@ -56,16 +56,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: gradle-java11-pusher
-            repository: pusher/pusher-http-java
-            ref: 94f25a2848e5939cf27dafad8ed25aeaa2d83274
-            directory: .
-            build_tool: gradle
-            build_command: ""
-            java: 11
-            bazel_version: ""
-            covers: Gradle, Java project target 11, Java 11 runtime
-
           - name: maven-java17-spring-boot
             repository: spring-guides/gs-spring-boot
             ref: 2ffad4f418c3052b534184228a45d062f566096f
@@ -76,16 +66,6 @@ jobs:
             bazel_version: ""
             covers: Maven, Java project target 17, Java 17 runtime
 
-          - name: maven-java11-wagon-multimodule
-            repository: apache/maven-wagon
-            ref: 20b847446bb60f49af0428d592eadee774b5bff2
-            directory: .
-            build_tool: maven
-            build_command: "-DskipTests compile"
-            java: 11
-            bazel_version: ""
-            covers: Maven, multi-module Java, Java 11 runtime
-
           - name: maven-kotlin-json-kotlin-maven
             repository: pwall567/json-kotlin-maven
             ref: 523f4fd624c3abca4a083c96be596d6f4799b705
@@ -108,16 +88,6 @@ jobs:
             bazel_version: ""
             covers: Gradle, Java project target 21, Java 21 runtime
 
-          - name: gradle-java11-mapstruct-lombok
-            repository: mapstruct/mapstruct-examples
-            ref: 3f9fd5ffe9e2272b6219a4216e842f8c009d1005
-            directory: mapstruct-lombok
-            build_tool: gradle
-            build_command: "compileJava"
-            java: 11
-            bazel_version: ""
-            covers: Gradle, Java annotation processors, Lombok, MapStruct, generated sources, Java 11 runtime
-
           - name: gradle-kotlin-okio
             repository: square/okio
             ref: parent-3.16.0

.gitignore

@@ -79,3 +79,5 @@ scip-snapshots/META-INF/
 # writes META-INF/scip/sources/Test.kt.scip relative to the test
 # cwd.
 scip-kotlinc/META-INF/
+
+/.kotlin/

CONTRIBUTING.md

@@ -9,7 +9,7 @@ The recommended way to get a working development environment is via
 [Nix](https://nixos.org/download) and the provided [flake](https://github.com/sourcegraph/scip-java/blob/main/flake.nix):
 
 ```sh
-nix develop              # default shell (JDK 11)
+nix develop              # default shell (JDK 17)
 nix develop .#jdk17      # JDK 17
 nix develop .#jdk21      # JDK 21
 ```
@@ -19,7 +19,7 @@ This drops you into a shell with `gradle`, `maven`, `bazelisk`, `nodejs`,
 
 If you'd rather install tools manually, you'll need at least:
 
-- `java`: any version should work
+- `java`: JDK 17 or newer
 - `git`: any version should work
 - `gradle`: `brew install gradle`, or see
   [general installation guide](https://gradle.org/install/).

bin/docker-setup.sh

@@ -16,7 +16,7 @@ rm gradle.zip
 mv /opt/gradle/*/* /opt/gradle
 
 # pre-install JDK for all major versions
-for JVM_VERSION in 21 17 11
+for JVM_VERSION in 21 17
 do 
   coursier java --jvm $JVM_VERSION --jvm-index https://github.com/coursier/jvm-index/blob/master/index.json -- -version
 done

bin/scip-java-docker-script.sh

@@ -3,7 +3,7 @@
 # version. It assumes that `coursier` is available on the `$PATH` and that the
 # `scip-java` binary is already installed at `/app/scip-java/bin/scip-java`.
 set -eu
-JVM_VERSION="${JVM_VERSION:-21,17,11,8}"
+JVM_VERSION="${JVM_VERSION:-21,17}"
 FILE="$PWD/lsif-java.json"
 if test -f "$FILE"; then
 	FROM_CONFIG=$(jq -r '.jvm' "$FILE")
@@ -12,6 +12,13 @@ if test -f "$FILE"; then
 	fi
 fi
 
+# scip-java requires JDK 17+, all of which need these --add-exports to reach
+# internal javac APIs, so apply them unconditionally. The build derives them
+# from gradle/javac-internals.properties (the single source of truth) and ships
+# them ready-to-use in the distribution.
+JAVA_OPTS=$(cat /app/scip-java/javac-jvm-options)
+export JAVA_OPTS
+
 JVM_VERSIONS=$(echo "$JVM_VERSION" | tr "," "\n")
 
 LAST_CODE="-1"
@@ -21,11 +28,6 @@ do
 	if [ "$LAST_CODE" != "0" ]; then
 		echo "Using JVM version '$JVM_VERSION'"
 
-		if [ "$JVM_VERSION" = "17" ] || [ "$JVM_VERSION" = "21" ]; then
-			export JAVA_OPTS="--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
-		else
-			export JAVA_OPTS=""
-		fi
 		eval "$(coursier java --jvm "$JVM_VERSION" --env --jvm-index https://github.com/coursier/jvm-index/blob/master/index.json)"
 
 		java -version

build.gradle.kts

@@ -57,13 +57,13 @@ subprojects {
 
     plugins.withType<JavaPlugin> {
         extensions.configure<JavaPluginExtension> {
-            sourceCompatibility = JavaVersion.VERSION_11
-            targetCompatibility = JavaVersion.VERSION_11
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
         }
 
         tasks.withType<JavaCompile>().configureEach {
             options.encoding = "UTF-8"
-            options.release.set(11)
+            options.release.set(17)
         }
 
         tasks.withType<Javadoc>().configureEach {
@@ -81,7 +81,7 @@ subprojects {
 
     plugins.withId("org.jetbrains.kotlin.jvm") {
         tasks.withType<KotlinCompile>().configureEach {
-            compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
+            compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 }
@@ -342,10 +342,26 @@ project(":scip-java") {
         }
     }
 
+    // Emit the javac --add-exports flags as a ready-to-use, space-separated
+    // string so the Docker wrapper script can read them with a plain `cat`,
+    // keeping gradle/javac-internals.properties the single source of truth.
+    val generateJavacJvmOptions = tasks.register("generateJavacJvmOptions") {
+        val output = layout.buildDirectory.file("generated/distribution/javac-jvm-options")
+        val options = javacJvmOptions.joinToString(" ")
+        inputs.property("options", options)
+        outputs.file(output)
+        doLast {
+            val file = output.get().asFile
+            file.parentFile.mkdirs()
+            file.writeText("$options\n")
+        }
+    }
+
     extensions.configure<DistributionContainer> {
         named("main") {
             contents {
                 from(generateDistributionVersion)
+                from(generateJavacJvmOptions)
             }
         }
     }
@@ -455,7 +471,7 @@ project(":scip-snapshots") {
                 rootProject.layout.projectDirectory.dir("scip-snapshots/expected/kotlin/common").asFile.absolutePath,
             "snapshot.case.kotlin-common.targetroot" to kotlinTargetroot.get().asFile.absolutePath,
             "snapshot.case.kotlin-common.aggregateNoEmitInverseRelationships" to "true",
-            "scip.jdk.version" to "11",
+            "scip.jdk.version" to "17",
         )
 
     tasks.named<Test>("test") {

docs/getting-started.md

@@ -35,7 +35,7 @@ finished indexing the project.
 
 > The `sourcegraph/scip-java` Docker image is made available for convenience at
 > the cost of performance. The `sourcegraph/scip-java` image is a big download
-> because it includes pre-installed versions of Java 11, Java 17, and Java 21.
+> because it includes pre-installed versions of Java 17 and Java 21.
 > The `sourcegraph/scip-java` image has slow performance because it needs to
 > download all external dependencies of your codebase on every invocation.
 >
@@ -46,9 +46,6 @@ Java 17 is the default Java version in the `sourcegraph/scip-java` Docker image.
 Use the following commands to use a different JVM version:
 
 ```sh
-# Java 11
-docker run -v $(pwd):/sources --env JVM_VERSION=11 sourcegraph/scip-java:latest scip-java index
-
 # Java 17 (default)
 docker run -v $(pwd):/sources --env JVM_VERSION=17 sourcegraph/scip-java:latest scip-java index
 
@@ -60,7 +57,7 @@ docker run -v $(pwd):/sources --env JVM_VERSION=21 sourcegraph/scip-java:latest
 ### Java launcher
 
 Use the Java launcher to install `scip-java` on your local computer or any
-Docker image with a pre-installed Java version.
+Docker image with a pre-installed Java version (JDK 17 or newer).
 
 ```sh
 # macOS/Linux
@@ -86,7 +83,8 @@ the `index` subcommand.
 ### Java fat jar
 
 Use the fat jar option to build a standalone `scip-java` executable. Note that
-you still need a Java installation to run the `scip-java` binary.
+you still need a Java installation (JDK 17 or newer) to run the `scip-java`
+binary.
 
 ```sh
 # macOS/Linux
@@ -204,7 +202,7 @@ of Java versions.
 | ------------ | ---------------------------- | -------------- |
 | Java 7       | ❌                           |                |
 | Java 8       | ❌                           |                |
-| Java 11      | ✅                           |                |
+| Java 11      | ❌                           |                |
 | Java 17      | ✅, requires `--add-exports` |                |
 | Java 21      | ✅, requires `--add-exports` |                |
 

docs/manual-configuration.md

@@ -117,8 +117,8 @@ targetroot directory.
 
 ```
 ❯ find $TARGETROOT -type f
-build/scip-targetroot/META-INF/scip/j11/src/test/java/example/ExampleTest.java.scip
-build/scip-targetroot/META-INF/scip/j11/src/main/java/example/Example.java.scip
+build/scip-targetroot/META-INF/scip/j17/src/test/java/example/ExampleTest.java.scip
+build/scip-targetroot/META-INF/scip/j17/src/main/java/example/Example.java.scip
 ...
 ```