From de79da2968a8bbbdd88dd1ea84298a058954a2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Mi=C5=9B?= Date: Wed, 29 May 2024 20:45:11 +0200 Subject: [PATCH] Replace deprecated javax.annotation-api MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patryk Miś --- .../input/BrailleInputPlaneResult.java | 2 +- .../brailleime/input/MultitouchResult.java | 2 +- gradle/verification-metadata.xml | 2266 ----------------- shared.gradle | 4 +- .../AutoValue_Feedback_AdjustVolume.java | 2 +- .../AutoValue_Feedback_ContinuousRead.java | 2 +- .../AutoValue_Feedback_DeviceInfo.java | 2 +- .../AutoValue_Feedback_FocusDirection.java | 2 +- .../AutoValue_Feedback_PassThroughMode.java | 2 +- .../talkback/AutoValue_Feedback_Scroll.java | 2 +- 10 files changed, 10 insertions(+), 2276 deletions(-) delete mode 100644 gradle/verification-metadata.xml diff --git a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlaneResult.java b/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlaneResult.java index 46ae150fa..cc3e9d015 100644 --- a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/BrailleInputPlaneResult.java +++ b/braille/brailleime/src/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/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/MultitouchResult.java b/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/MultitouchResult.java index b0cc9ea9e..086301a0a 100644 --- a/braille/brailleime/src/phone/java/com/google/android/accessibility/brailleime/input/MultitouchResult.java +++ b/braille/brailleime/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 deleted file mode 100644 index 3686401a1..000000000 --- a/gradle/verification-metadata.xml +++ /dev/null @@ -1,2266 +0,0 @@ - - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shared.gradle b/shared.gradle index 0e81f0027..3ba510dd4 100644 --- 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/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_AdjustVolume.java b/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_AdjustVolume.java index 8ddff52cf..a4ffbfa4b 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_AdjustVolume.java +++ b/talkback/src/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/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_ContinuousRead.java b/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_ContinuousRead.java index 745ab449e..2efa3db17 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_ContinuousRead.java +++ b/talkback/src/main/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/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_DeviceInfo.java b/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_DeviceInfo.java index 47ce546bc..06123c54d 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_DeviceInfo.java +++ b/talkback/src/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/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_FocusDirection.java b/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_FocusDirection.java index d1a3827c2..342c73ad2 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_FocusDirection.java +++ b/talkback/src/main/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/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_PassThroughMode.java b/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_PassThroughMode.java index 03599c0c5..b8f9c20fa 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_PassThroughMode.java +++ b/talkback/src/main/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/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_Scroll.java b/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_Scroll.java index 68ca71ff5..48c4a9f5b 100644 --- a/talkback/src/main/java/com/google/android/accessibility/talkback/AutoValue_Feedback_Scroll.java +++ b/talkback/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