Support building against java 8

internal/java_8_library.bzl

@@ -0,0 +1,8 @@
+load("@rules_java//java:java_library.bzl", "java_library")
+
+def java_8_library(name, javacopts = [], **kwargs):
+    java_library(
+        name = name,
+        javacopts = javacopts + ["--release", "8"],
+        **kwargs
+    )

src/main/java/com/google/crypto/tink/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 load("//:template_rule.bzl", "template_rule")
 load("//:tink_version.bzl", "get_tink_version_label")
 

src/main/java/com/google/crypto/tink/aead/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/aead/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 package(default_visibility = ["//visibility:public"])
 

src/main/java/com/google/crypto/tink/aead/subtle/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/annotations/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/config/BUILD.bazel

@@ -1,5 +1,6 @@
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/config/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/daead/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/daead/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/daead/internal/testing/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/daead/subtle/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/hybrid/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/hybrid/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 package(default_visibility = ["//visibility:public"])
 

src/main/java/com/google/crypto/tink/hybrid/internal/testing/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/hybrid/subtle/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/internal/testing/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/jwt/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/jwt/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/keyderivation/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 package(default_visibility = ["//visibility:public"])
 

src/main/java/com/google/crypto/tink/mac/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/mac/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/prf/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/prf/internal/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 

src/main/java/com/google/crypto/tink/signature/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//:internal/java_8_library.bzl", java_library = "java_8_library")
 
 licenses(["notice"])
 
@@ -1304,6 +1305,7 @@ java_library(
         "//src/main/java/com/google/crypto/tink/signature/internal:ml_dsa_proto_serialization",
         "//src/main/java/com/google/crypto/tink/signature/internal:ml_dsa_verify_conscrypt",
         "//src/main/java/com/google/crypto/tink/util:bytes",
+        "//src/main/java/com/google/crypto/tink/util:maps",
         "//src/main/java/com/google/crypto/tink/util:secret_bytes",
         "@maven//:com_google_code_findbugs_jsr305",
     ],
@@ -1327,6 +1329,7 @@ android_library(
         "//src/main/java/com/google/crypto/tink/signature/internal:ml_dsa_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/signature/internal:ml_dsa_verify_conscrypt-android",
         "//src/main/java/com/google/crypto/tink/util:bytes-android",
+        "//src/main/java/com/google/crypto/tink/util:maps-android",
         "//src/main/java/com/google/crypto/tink/util:secret_bytes-android",
         "@maven//:com_google_code_findbugs_jsr305",
     ],
@@ -1388,6 +1391,7 @@ android_library(
         "//src/main/java/com/google/crypto/tink/signature/internal:slh_dsa_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/signature/internal:slh_dsa_verify_conscrypt-android",
         "//src/main/java/com/google/crypto/tink/util:bytes-android",
+        "//src/main/java/com/google/crypto/tink/util:maps-android",
         "//src/main/java/com/google/crypto/tink/util:secret_bytes-android",
         "@maven//:com_google_code_findbugs_jsr305",
     ],
@@ -1449,6 +1453,7 @@ java_library(
         "//src/main/java/com/google/crypto/tink/signature/internal:slh_dsa_proto_serialization",
         "//src/main/java/com/google/crypto/tink/signature/internal:slh_dsa_verify_conscrypt",
         "//src/main/java/com/google/crypto/tink/util:bytes",
+        "//src/main/java/com/google/crypto/tink/util:maps",
         "//src/main/java/com/google/crypto/tink/util:secret_bytes",
         "@maven//:com_google_code_findbugs_jsr305",
     ],
@@ -1489,6 +1494,7 @@ android_library(
         "//src/main/java/com/google/crypto/tink:key-android",
         "//src/main/java/com/google/crypto/tink/internal:output_prefix_util-android",
         "//src/main/java/com/google/crypto/tink/util:bytes-android",
+        "//src/main/java/com/google/crypto/tink/util:maps-android",
         "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_errorprone_error_prone_annotations",
     ],
@@ -1511,6 +1517,7 @@ java_library(
         "//src/main/java/com/google/crypto/tink:key",
         "//src/main/java/com/google/crypto/tink/internal:output_prefix_util",
         "//src/main/java/com/google/crypto/tink/util:bytes",
+        "//src/main/java/com/google/crypto/tink/util:maps",
         "@maven//:com_google_code_findbugs_jsr305",
         "@maven//:com_google_errorprone_error_prone_annotations",
     ],

src/main/java/com/google/crypto/tink/signature/CompositeMlDsaPublicKey.java

@@ -16,6 +16,9 @@
 
 package com.google.crypto.tink.signature;
 
+import static com.google.crypto.tink.util.Maps.entry;
+import static com.google.crypto.tink.util.Maps.ofEntries;
+
 import com.google.crypto.tink.AccessesPartialKey;
 import com.google.crypto.tink.Key;
 import com.google.crypto.tink.internal.OutputPrefixUtil;
@@ -37,58 +40,66 @@ public final class CompositeMlDsaPublicKey extends SignaturePublicKey {
   private static Map<CompositeMlDsaParameters.ClassicalAlgorithm, SignatureParameters>
       createSupportedClassicalParameters() {
     try {
-      return Map.of(
-          CompositeMlDsaParameters.ClassicalAlgorithm.ED25519,
-          Ed25519Parameters.create(Ed25519Parameters.Variant.NO_PREFIX),
-          CompositeMlDsaParameters.ClassicalAlgorithm.ECDSA_P256,
-          EcdsaParameters.builder()
-              .setHashType(EcdsaParameters.HashType.SHA256)
-              .setCurveType(EcdsaParameters.CurveType.NIST_P256)
-              .setVariant(EcdsaParameters.Variant.NO_PREFIX)
-              .setSignatureEncoding(EcdsaParameters.SignatureEncoding.IEEE_P1363)
-              .build(),
-          CompositeMlDsaParameters.ClassicalAlgorithm.ECDSA_P384,
-          EcdsaParameters.builder()
-              .setHashType(EcdsaParameters.HashType.SHA384)
-              .setCurveType(EcdsaParameters.CurveType.NIST_P384)
-              .setSignatureEncoding(EcdsaParameters.SignatureEncoding.IEEE_P1363)
-              .setVariant(EcdsaParameters.Variant.NO_PREFIX)
-              .build(),
-          CompositeMlDsaParameters.ClassicalAlgorithm.ECDSA_P521,
-          EcdsaParameters.builder()
-              .setHashType(EcdsaParameters.HashType.SHA512)
-              .setCurveType(EcdsaParameters.CurveType.NIST_P521)
-              .setSignatureEncoding(EcdsaParameters.SignatureEncoding.IEEE_P1363)
-              .setVariant(EcdsaParameters.Variant.NO_PREFIX)
-              .build(),
-          CompositeMlDsaParameters.ClassicalAlgorithm.RSA3072_PSS,
-          RsaSsaPssParameters.builder()
-              .setModulusSizeBits(3072)
-              .setSigHashType(RsaSsaPssParameters.HashType.SHA256)
-              .setMgf1HashType(RsaSsaPssParameters.HashType.SHA256)
-              .setSaltLengthBytes(32)
-              .setVariant(RsaSsaPssParameters.Variant.NO_PREFIX)
-              .build(),
-          CompositeMlDsaParameters.ClassicalAlgorithm.RSA4096_PSS,
-          RsaSsaPssParameters.builder()
-              .setModulusSizeBits(4096)
-              .setSigHashType(RsaSsaPssParameters.HashType.SHA384)
-              .setMgf1HashType(RsaSsaPssParameters.HashType.SHA384)
-              .setSaltLengthBytes(48)
-              .setVariant(RsaSsaPssParameters.Variant.NO_PREFIX)
-              .build(),
-          CompositeMlDsaParameters.ClassicalAlgorithm.RSA3072_PKCS1,
-          RsaSsaPkcs1Parameters.builder()
-              .setModulusSizeBits(3072)
-              .setHashType(RsaSsaPkcs1Parameters.HashType.SHA256)
-              .setVariant(RsaSsaPkcs1Parameters.Variant.NO_PREFIX)
-              .build(),
-          CompositeMlDsaParameters.ClassicalAlgorithm.RSA4096_PKCS1,
-          RsaSsaPkcs1Parameters.builder()
-              .setModulusSizeBits(4096)
-              .setHashType(RsaSsaPkcs1Parameters.HashType.SHA384)
-              .setVariant(RsaSsaPkcs1Parameters.Variant.NO_PREFIX)
-              .build());
+      return ofEntries(
+          entry(
+              CompositeMlDsaParameters.ClassicalAlgorithm.ED25519,
+              Ed25519Parameters.create(Ed25519Parameters.Variant.NO_PREFIX)),
+          entry(
+              CompositeMlDsaParameters.ClassicalAlgorithm.ECDSA_P256,
+              EcdsaParameters.builder()
+                  .setHashType(EcdsaParameters.HashType.SHA256)
+                  .setCurveType(EcdsaParameters.CurveType.NIST_P256)
+                  .setVariant(EcdsaParameters.Variant.NO_PREFIX)
+                  .setSignatureEncoding(EcdsaParameters.SignatureEncoding.IEEE_P1363)
+                  .build()),
+          entry(
+              CompositeMlDsaParameters.ClassicalAlgorithm.ECDSA_P384,
+              EcdsaParameters.builder()
+                  .setHashType(EcdsaParameters.HashType.SHA384)
+                  .setCurveType(EcdsaParameters.CurveType.NIST_P384)
+                  .setSignatureEncoding(EcdsaParameters.SignatureEncoding.IEEE_P1363)
+                  .setVariant(EcdsaParameters.Variant.NO_PREFIX)
+                  .build()),
+          entry(
+              CompositeMlDsaParameters.ClassicalAlgorithm.ECDSA_P521,
+              EcdsaParameters.builder()
+                  .setHashType(EcdsaParameters.HashType.SHA512)
+                  .setCurveType(EcdsaParameters.CurveType.NIST_P521)
+                  .setSignatureEncoding(EcdsaParameters.SignatureEncoding.IEEE_P1363)
+                  .setVariant(EcdsaParameters.Variant.NO_PREFIX)
+                  .build()),
+          entry(
+              CompositeMlDsaParameters.ClassicalAlgorithm.RSA3072_PSS,
+              RsaSsaPssParameters.builder()
+                  .setModulusSizeBits(3072)
+                  .setSigHashType(RsaSsaPssParameters.HashType.SHA256)
+                  .setMgf1HashType(RsaSsaPssParameters.HashType.SHA256)
+                  .setSaltLengthBytes(32)
+                  .setVariant(RsaSsaPssParameters.Variant.NO_PREFIX)
+                  .build()),
+          entry(
+              CompositeMlDsaParameters.ClassicalAlgorithm.RSA4096_PSS,
+              RsaSsaPssParameters.builder()
+                  .setModulusSizeBits(4096)
+                  .setSigHashType(RsaSsaPssParameters.HashType.SHA384)
+                  .setMgf1HashType(RsaSsaPssParameters.HashType.SHA384)
+                  .setSaltLengthBytes(48)
+                  .setVariant(RsaSsaPssParameters.Variant.NO_PREFIX)
+                  .build()),
+          entry(
+              CompositeMlDsaParameters.ClassicalAlgorithm.RSA3072_PKCS1,
+              RsaSsaPkcs1Parameters.builder()
+                  .setModulusSizeBits(3072)
+                  .setHashType(RsaSsaPkcs1Parameters.HashType.SHA256)
+                  .setVariant(RsaSsaPkcs1Parameters.Variant.NO_PREFIX)
+                  .build()),
+          entry(
+              CompositeMlDsaParameters.ClassicalAlgorithm.RSA4096_PKCS1,
+              RsaSsaPkcs1Parameters.builder()
+                  .setModulusSizeBits(4096)
+                  .setHashType(RsaSsaPkcs1Parameters.HashType.SHA384)
+                  .setVariant(RsaSsaPkcs1Parameters.Variant.NO_PREFIX)
+                  .build()));
     } catch (GeneralSecurityException e) {
       throw new IllegalStateException("Could not create supported classical parameters", e);
     }
@@ -191,7 +202,9 @@ public CompositeMlDsaPublicKey build() throws GeneralSecurityException {
   }
 
   @RestrictedApi(
-      explanation = "Accessing parts of keys can produce unexpected incompatibilities, annotate the function with @AccessesPartialKey",
+      explanation =
+          "Accessing parts of keys can produce unexpected incompatibilities, annotate the function"
+              + " with @AccessesPartialKey",
       link = "https://developers.google.com/tink/design/access_control#accessing_partial_keys",
       allowedOnPath = ".*Test\\.java",
       allowlistAnnotations = {AccessesPartialKey.class})