Vertispan v0.2

.github/workflows/ci.yml

@@ -29,19 +29,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        java: [ 17, 11 ]
+        java: [ 21, 17, 11 ]
         experimental: [ false ]
         include:
           # Only test on macos and windows with a single recent JDK to avoid a
           # combinatorial explosion of test configurations.
           - os: macos-latest
-            java: 17
+            java: 21
             experimental: false
           - os: windows-latest
-            java: 17
+            java: 21
             experimental: false
           - os: ubuntu-latest
-            java: 18-ea
+            java: 22-ea
             experimental: true
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}

.github/workflows/release.yml

@@ -0,0 +1,62 @@
+name: Release turbine
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "version number for this release."
+        required: true
+
+jobs:
+  build-maven-jars:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:         
+      - name: Checkout
+        uses: actions/[email protected]
+
+      - name: Set up JDK
+        uses: actions/[email protected]
+        with:
+          java-version: 11
+          distribution: 'zulu'
+          cache: 'maven'
+          server-id: sonatype-nexus-staging
+          server-username: CI_DEPLOY_USERNAME
+          server-password: CI_DEPLOY_PASSWORD
+          gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+
+      - name: Bump Version Number
+        run: |
+          mvn --no-transfer-progress versions:set versions:commit -DnewVersion="${{ github.event.inputs.version }}"
+          git ls-files | grep 'pom.xml$' | xargs git add
+          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+          git config --global user.name "${{ github.actor }}"
+          git commit -m "Release turbine ${{ github.event.inputs.version }}"
+          git tag "v${{ github.event.inputs.version }}"
+          echo "TARGET_COMMITISH=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/google/turbine.git
+
+      - name: Deploy to Sonatype staging
+        env:
+          CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+          CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+        run:
+          mvn --no-transfer-progress -P sonatype-oss-release clean deploy -Dgpg.passphrase="${{ secrets.GPG_PASSPHRASE }}"
+
+      - name: Push tag
+        run: |
+          git push origin "v${{ github.event.inputs.version }}"
+
+      - name: Add Jars to Release Entry
+        uses: softprops/[email protected]
+        with:
+          draft: true
+          name: ${{ github.event.input.version }} 
+          tag_name: "v${{ github.event.inputs.version }}"
+          target_commitish: ${{ env.TARGET_COMMITISH }}
+          files: |
+            target/turbine-*.jar

KEYS.txt

@@ -0,0 +1,65 @@
+This file contains the PGP and GPG keys used to sign releases.
+
+gpg --list-sigs <your name> && gpg --armor --export <your name>
+
+************************************************************************************************************
+
+pub   rsa4096 2022-01-28 [SC]
+      EE0CA873074092F806F59B65D364ABAA39A47320
+uid           [ultimate] Liam Miller-Cushon (Error Prone releases) <[email protected]>
+sig 3        D364ABAA39A47320 2022-01-28  Liam Miller-Cushon (Error Prone releases) <[email protected]>
+sub   rsa4096 2022-01-28 [E]
+sig          D364ABAA39A47320 2022-01-28  Liam Miller-Cushon (Error Prone releases) <[email protected]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+pOSpujhmmBPD/tnf58BgT+/Gq6GemXYe8Q==
+=BIwO
+-----END PGP PUBLIC KEY BLOCK-----

java/com/google/turbine/binder/ClassPathBinder.java

@@ -16,7 +16,6 @@
 
 package com.google.turbine.binder;
 
-import com.google.common.base.Function;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableMap;
@@ -36,6 +35,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.function.Function;
 import org.jspecify.nullness.Nullable;
 
 /** Sets up an environment for symbols on the classpath. */

java/com/google/turbine/binder/CompUnitPreprocessor.java

@@ -36,6 +36,8 @@
 import com.google.turbine.tree.Tree.PkgDecl;
 import com.google.turbine.tree.Tree.TyDecl;
 import com.google.turbine.tree.TurbineModifier;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -105,7 +107,7 @@ public static PreprocessedCompUnit preprocess(CompUnit unit) {
       // "While the file could technically contain the source code
       // for one or more package-private (default-access) classes,
       // it would be very bad form." -- JLS 7.4.1
-      if (!unit.pkg().get().annos().isEmpty()) {
+      if (isPackageInfo(unit)) {
         decls = Iterables.concat(decls, ImmutableList.of(packageInfoTree(unit.pkg().get())));
       }
     } else {
@@ -124,6 +126,18 @@ public static PreprocessedCompUnit preprocess(CompUnit unit) {
         unit.imports(), types.build(), unit.mod(), unit.source(), packageName);
   }
 
+  private static boolean isPackageInfo(CompUnit unit) {
+    String path = unit.source().path();
+    if (path == null) {
+      return false;
+    }
+    Path fileName = Paths.get(path).getFileName();
+    if (fileName == null) {
+      return false;
+    }
+    return fileName.toString().equals("package-info.java");
+  }
+
   private static ImmutableMap<String, ClassSymbol> preprocessChildren(
       SourceFile source,
       ImmutableList.Builder<SourceBoundClass> types,

java/com/google/turbine/binder/FileManagerClassBinder.java

@@ -19,7 +19,6 @@
 import com.google.common.base.Joiner;
 import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.io.ByteStreams;
 import com.google.turbine.binder.bound.ModuleInfo;
 import com.google.turbine.binder.bytecode.BytecodeBoundClass;
 import com.google.turbine.binder.env.Env;
@@ -113,7 +112,7 @@ private ImmutableMap<ClassSymbol, BytecodeBoundClass> listPackage(
                   @Override
                   public byte[] get() {
                     try {
-                      return ByteStreams.toByteArray(jfo.openInputStream());
+                      return jfo.openInputStream().readAllBytes();
                     } catch (IOException e) {
                       throw new UncheckedIOException(e);
                     }
@@ -162,7 +161,7 @@ private Map<ClassSymbol, BytecodeBoundClass> getPackage(
         @Override
         public byte[] get() {
           try {
-            return ByteStreams.toByteArray(fileObject.openInputStream());
+            return fileObject.openInputStream().readAllBytes();
           } catch (IOException e) {
             throw new UncheckedIOException(e);
           }

java/com/google/turbine/binder/HierarchyBinder.java

@@ -34,6 +34,7 @@
 import com.google.turbine.tree.Tree;
 import com.google.turbine.tree.Tree.ClassTy;
 import java.util.ArrayDeque;
+import java.util.LinkedHashMap;
 import org.jspecify.nullness.Nullable;
 
 /** Type hierarchy binding. */
@@ -109,13 +110,17 @@ private SourceHeaderBoundClass bind() {
       }
     }
 
-    ImmutableMap.Builder<String, TyVarSymbol> typeParameters = ImmutableMap.builder();
+    LinkedHashMap<String, TyVarSymbol> typeParameters = new LinkedHashMap<>();
     for (Tree.TyParam p : decl.typarams()) {
-      typeParameters.put(p.name().value(), new TyVarSymbol(origin, p.name().value()));
+      TyVarSymbol existing =
+          typeParameters.putIfAbsent(p.name().value(), new TyVarSymbol(origin, p.name().value()));
+      if (existing != null) {
+        log.error(p.position(), ErrorKind.DUPLICATE_DECLARATION, p.name());
+      }
     }
 
     return new SourceHeaderBoundClass(
-        base, superclass, interfaces.build(), typeParameters.buildOrThrow());
+        base, superclass, interfaces.build(), ImmutableMap.copyOf(typeParameters));
   }
 
   /**

java/com/google/turbine/binder/Processing.java

@@ -19,7 +19,6 @@
 import static java.util.Objects.requireNonNull;
 
 import com.google.auto.value.AutoValue;
-import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Stopwatch;
 import com.google.common.base.Supplier;
@@ -66,6 +65,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.regex.Pattern;
 import javax.annotation.processing.Processor;
 import javax.lang.model.SourceVersion;