Remove usages of androidx.annotation from the code which goes into the Java jar.

Context: #3 https://issuetracker.google.com/issues/273498073#comment8 PiperOrigin-RevId: 525422733 Change-Id: I119852be5326696a38c4daa94f5a2f9fd1a32406

Author: tholenst

maven/tink-java.pom.xml

@@ -84,7 +84,6 @@
 
  <properties>
  <java.version>1.8</java.version>
- <annotation.version>1.3.0</annotation.version>
  <jsr305.version>3.0.2</jsr305.version>
  <gson.version>2.10</gson.version>
  <error_prone_annotations.version>2.16</error_prone_annotations.version>
@@ -94,11 +93,6 @@
  </properties>
 
  <dependencies>
- <dependency>
- <groupId>androidx.annotation</groupId>
- <artifactId>annotation</artifactId>
- <version>${annotation.version}</version>
- </dependency>
  <dependency>
  <groupId>com.google.code.findbugs</groupId>
  <artifactId>jsr305</artifactId>
@@ -130,12 +124,7 @@
  <version>${joda-time.version}</version>
  </dependency>
  </dependencies>
-
  <repositories>
- <repository>
- <id>google-maven-repository</id>
- <url>https://maven.google.com</url>
- </repository>
  <repository>
  <id>maven-central-repository</id>
  <url>https://repo1.maven.org/maven2</url>

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

@@ -16,7 +16,6 @@ java_library(
 java_library(
  name = "streaming_aead",
  srcs = ["StreamingAead.java"],
- deps = ["@maven//:androidx_annotation_annotation"],
 )
 
 java_library(
@@ -138,7 +137,6 @@ java_library(
  ":keyset_writer",
  "//proto:tink_java_proto",
  "//src/main/java/com/google/crypto/tink/subtle:base64",
- "@maven//:androidx_annotation_annotation",
  "@maven//:com_google_code_gson_gson",
  "@maven//:com_google_errorprone_error_prone_annotations",
  ],
@@ -151,7 +149,6 @@ android_library(
  ":keyset_writer-android",
  "//proto:tink_java_proto_lite",
  "//src/main/java/com/google/crypto/tink/subtle:base64-android",
- "@maven//:androidx_annotation_annotation",
  "@maven//:com_google_code_gson_gson",
  "@maven//:com_google_errorprone_error_prone_annotations",
  ],
@@ -200,7 +197,6 @@ java_library(
  "//proto:tink_java_proto",
  "//src/main/java/com/google/crypto/tink/internal:json_parser",
  "//src/main/java/com/google/crypto/tink/subtle:base64",
- "@maven//:androidx_annotation_annotation",
  "@maven//:com_google_code_gson_gson",
  "@maven//:com_google_errorprone_error_prone_annotations",
  "@maven//:com_google_protobuf_protobuf_java",
@@ -216,7 +212,6 @@ android_library(
  "//proto:tink_java_proto_lite",
  "//src/main/java/com/google/crypto/tink/internal:json_parser-android",
  "//src/main/java/com/google/crypto/tink/subtle:base64-android",
- "@maven//:androidx_annotation_annotation",
  "@maven//:com_google_code_gson_gson",
  "@maven//:com_google_errorprone_error_prone_annotations",
  "@maven//:com_google_protobuf_protobuf_javalite",
@@ -871,7 +866,6 @@ android_library(
 android_library(
  name = "streaming_aead-android",
  srcs = ["StreamingAead.java"],
- deps = ["@maven//:androidx_annotation_annotation"],
 )
 
 android_library(

src/main/java/com/google/crypto/tink/JsonKeysetReader.java

@@ -16,7 +16,6 @@
 
 package com.google.crypto.tink;
 
-import androidx.annotation.RequiresApi;
 import com.google.crypto.tink.internal.JsonParser;
 import com.google.crypto.tink.proto.EncryptedKeyset;
 import com.google.crypto.tink.proto.KeyData;
@@ -146,7 +145,6 @@ public static JsonKeysetReader withPath(String path) throws IOException {
  @InlineMe(
  replacement = "JsonKeysetReader.withInputStream(new FileInputStream(path.toFile()))",
  imports = {"com.google.crypto.tink.JsonKeysetReader", "java.io.FileInputStream"})
- @RequiresApi(26) // https://developer.android.com/reference/java/nio/file/Path
  @Deprecated
  public static JsonKeysetReader withPath(Path path) throws IOException {
  return JsonKeysetReader.withInputStream(new FileInputStream(path.toFile()));

src/main/java/com/google/crypto/tink/JsonKeysetWriter.java

@@ -16,7 +16,6 @@
 
 package com.google.crypto.tink;
 
-import androidx.annotation.RequiresApi;
 import com.google.crypto.tink.proto.EncryptedKeyset;
 import com.google.crypto.tink.proto.KeyData;
 import com.google.crypto.tink.proto.Keyset;
@@ -95,7 +94,6 @@ public static KeysetWriter withPath(String path) throws IOException {
  *
  * @deprecated Method should be inlined.
  */
- @RequiresApi(26) // https://developer.android.com/reference/java/nio/file/Path
  @InlineMe(
  replacement = "JsonKeysetWriter.withOutputStream(new FileOutputStream(path.toFile()))",
  imports = {"com.google.crypto.tink.JsonKeysetWriter", "java.io.FileOutputStream"})

src/main/java/com/google/crypto/tink/StreamingAead.java

@@ -16,7 +16,6 @@
 
 package com.google.crypto.tink;
 
-import androidx.annotation.RequiresApi;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -162,7 +161,6 @@ WritableByteChannel newEncryptingChannel(
  * associatedData is not correct.
  * @throws IOException if an IOException occurred while reading from ciphertextDestination.
  */
- @RequiresApi(24) // https://developer.android.com/reference/java/nio/channels/SeekableByteChannel
  SeekableByteChannel newSeekableDecryptingChannel(
  SeekableByteChannel ciphertextSource, byte[] associatedData)
  throws GeneralSecurityException, IOException;

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

@@ -42,7 +42,6 @@ java_library(
  deps = [
  "//src/main/java/com/google/crypto/tink:primitive_set",
  "//src/main/java/com/google/crypto/tink:streaming_aead",
- "@maven//:androidx_annotation_annotation",
  "@maven//:com_google_code_findbugs_jsr305",
  "@maven//:com_google_errorprone_error_prone_annotations",
  ],
@@ -67,7 +66,6 @@ java_library(
  ":seekable_byte_channel_decrypter",
  "//src/main/java/com/google/crypto/tink:primitive_set",
  "//src/main/java/com/google/crypto/tink:streaming_aead",
- "@maven//:androidx_annotation_annotation",
  ],
 )
 
@@ -260,7 +258,6 @@ android_library(
  deps = [
  "//src/main/java/com/google/crypto/tink:primitive_set-android",
  "//src/main/java/com/google/crypto/tink:streaming_aead-android",
- "@maven//:androidx_annotation_annotation",
  "@maven//:com_google_code_findbugs_jsr305",
  "@maven//:com_google_errorprone_error_prone_annotations",
  ],
@@ -285,7 +282,6 @@ android_library(
  ":seekable_byte_channel_decrypter-android",
  "//src/main/java/com/google/crypto/tink:primitive_set-android",
  "//src/main/java/com/google/crypto/tink:streaming_aead-android",
- "@maven//:androidx_annotation_annotation",
  ],
 )
 

src/main/java/com/google/crypto/tink/streamingaead/SeekableByteChannelDecrypter.java

@@ -16,7 +16,6 @@
 
 package com.google.crypto.tink.streamingaead;
 
-import androidx.annotation.RequiresApi;
 import com.google.crypto.tink.StreamingAead;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.IOException;
@@ -30,7 +29,6 @@
 import javax.annotation.concurrent.GuardedBy;
 
 /** A decrypter for ciphertext given in a {@link SeekableByteChannel}. */
-@RequiresApi(24) // https://developer.android.com/reference/java/nio/channels/SeekableByteChannel
 final class SeekableByteChannelDecrypter implements SeekableByteChannel {
  @GuardedBy("this")
  SeekableByteChannel attemptingChannel;

src/main/java/com/google/crypto/tink/streamingaead/StreamingAeadHelper.java

@@ -16,7 +16,6 @@
 
 package com.google.crypto.tink.streamingaead;
 
-import androidx.annotation.RequiresApi;
 import com.google.crypto.tink.StreamingAead;
 import java.io.IOException;
 import java.io.InputStream;
@@ -61,7 +60,6 @@ public ReadableByteChannel newDecryptingChannel(
  }
 
  @Override
- @RequiresApi(24) // https://developer.android.com/reference/java/nio/channels/SeekableByteChannel
  public SeekableByteChannel newSeekableDecryptingChannel(
  SeekableByteChannel ciphertextChannel, byte[] associatedData)
  throws GeneralSecurityException, IOException {

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

@@ -471,7 +471,6 @@ java_library(
  ":stream_segment_decrypter",
  ":stream_segment_encrypter",
  "//src/main/java/com/google/crypto/tink:streaming_aead",
- "@maven//:androidx_annotation_annotation",
  "@maven//:com_google_errorprone_error_prone_annotations",
  ],
 )
@@ -780,7 +779,6 @@ android_library(
  ":stream_segment_decrypter-android",
  ":stream_segment_encrypter-android",
  "//src/main/java/com/google/crypto/tink:streaming_aead-android",
- "@maven//:androidx_annotation_annotation",
  "@maven//:com_google_errorprone_error_prone_annotations",
  ],
 )

src/main/java/com/google/crypto/tink/subtle/StreamingAeadSeekableDecryptingChannel.java

@@ -16,7 +16,6 @@
 
 package com.google.crypto.tink.subtle;
 
-import androidx.annotation.RequiresApi;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -30,7 +29,6 @@
  * An instance of {@link SeekableByteChannel} that allows random access to the plaintext of some
  * ciphertext.
  */
-@RequiresApi(24) // https://developer.android.com/reference/java/nio/channels/SeekableByteChannel
 class StreamingAeadSeekableDecryptingChannel implements SeekableByteChannel {
  // Each plaintext segment has 16 bytes more of memory than the actual plaintext that it contains.
  // This is a workaround for an incompatibility between Conscrypt and OpenJDK in their