Replace deprecated javax.annotation-api

Signed-off-by: Patryk Miś <foss@patrykmis.com>
talkback-foss-team · May 29, 2024 · de79da2 · de79da2
1 parent 650271a
commit de79da2
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 2,276 deletions.
diff --git a/...phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlaneResult.java b/...phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlaneResult.java
@@ -21,7 +21,7 @@
 import com.google.android.accessibility.braille.interfaces.BrailleCharacter;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * The result produced by a {@link BrailleInputPlane} commission.

diff --git a/...me/src/phone/java/com/google/android/accessibility/brailleime/input/MultitouchResult.java b/...me/src/phone/java/com/google/android/accessibility/brailleime/input/MultitouchResult.java
@@ -21,7 +21,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * The result produced by a {@link MultitouchHandler} commission.

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
diff --git a/shared.gradle b/shared.gradle
@@ -43,7 +43,7 @@ dependencies {
 
     // Support library
     implementation 'androidx.annotation:annotation:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.browser:browser:1.8.0'
     implementation 'androidx.collection:collection:1.4.0'
     implementation 'androidx.core:core:1.13.1'
@@ -59,5 +59,5 @@ dependencies {
     // Auto-value
     implementation 'com.google.auto.value:auto-value-annotations:1.10.4'
     annotationProcessor 'com.google.auto.value:auto-value:1.10.4'
-    implementation 'javax.annotation:javax.annotation-api:1.3.2'
+    implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5'
 }
diff --git a/.../main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_AdjustVolume.java b/.../main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_AdjustVolume.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.accessibility.talkback;
 
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 // This file is normally auto-generated using the @AutoValue processor.  But
 // that operation has been failing on the gradle-based build, so this file is

diff --git a/...ain/java/com/google/android/accessibility/talkback/AutoValue_Feedback_ContinuousRead.java b/...ain/java/com/google/android/accessibility/talkback/AutoValue_Feedback_ContinuousRead.java
@@ -15,7 +15,7 @@
  */
 package com.google.android.accessibility.talkback;
 
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 // This file is normally auto-generated using the @AutoValue processor.  But
 // that operation has been failing on the gradle-based build, so this file is

diff --git a/...rc/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_DeviceInfo.java b/...rc/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_DeviceInfo.java
@@ -16,7 +16,7 @@
 package com.google.android.accessibility.talkback;
 
 import android.content.res.Configuration;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 // This file is normally auto-generated using the @AutoValue processor.

diff --git a/...ain/java/com/google/android/accessibility/talkback/AutoValue_Feedback_FocusDirection.java b/...ain/java/com/google/android/accessibility/talkback/AutoValue_Feedback_FocusDirection.java
@@ -20,7 +20,7 @@
 import com.google.android.accessibility.utils.input.CursorGranularity;
 import com.google.android.accessibility.utils.monitor.InputModeTracker;
 import com.google.android.accessibility.utils.traversal.TraversalStrategy;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 // This file is normally auto-generated using the @AutoValue processor.  But

diff --git a/...in/java/com/google/android/accessibility/talkback/AutoValue_Feedback_PassThroughMode.java b/...in/java/com/google/android/accessibility/talkback/AutoValue_Feedback_PassThroughMode.java
@@ -17,7 +17,7 @@
 package com.google.android.accessibility.talkback;
 
 import android.graphics.Region;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 // This file is normally auto-generated using the @AutoValue processor.  But
 // that operation has been failing on the gradle-based build, so this file is

diff --git a/...ck/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_Scroll.java b/...ck/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_Scroll.java
@@ -21,7 +21,7 @@
 import com.google.android.accessibility.utils.AccessibilityNode;
 import com.google.android.accessibility.utils.input.ScrollEventInterpreter.ScrollTimeout;
 import com.google.android.accessibility.utils.output.ScrollActionRecord;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 // This file is normally auto-generated using the @AutoValue processor.  But