From 329aad2a8dee51f0cbe366fa0fbf0365cb39e0ad Mon Sep 17 00:00:00 2001 From: Peter Abeles Date: Mon, 5 Feb 2024 10:00:03 -0800 Subject: [PATCH] Switch to AndroidX annotations --- integration/boofcv-android/build.gradle | 2 +- .../main/java/boofcv/android/BOverrideConvertAndroid.java | 4 ++-- .../src/main/java/boofcv/android/camera/CameraPreview.java | 4 ++-- .../java/boofcv/android/camera/VideoDisplayActivity.java | 4 ++-- .../java/boofcv/android/camera2/SimpleCamera2Activity.java | 6 +++--- .../boofcv/android/camera2/VisualizeCamera2Activity.java | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/integration/boofcv-android/build.gradle b/integration/boofcv-android/build.gradle index 17666f19c4..54045d25bb 100644 --- a/integration/boofcv-android/build.gradle +++ b/integration/boofcv-android/build.gradle @@ -63,7 +63,7 @@ dependencies { compileOnly "org.jetbrains:annotations:$project.jetnull_version" // @Nullable - compileOnly 'com.android.support:support-annotations:28.0.0' + implementation "androidx.annotation:annotation:1.7.1" annotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:${project.jabel_version}") } diff --git a/integration/boofcv-android/src/main/java/boofcv/android/BOverrideConvertAndroid.java b/integration/boofcv-android/src/main/java/boofcv/android/BOverrideConvertAndroid.java index 9c2098fb0e..2d1418c382 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/BOverrideConvertAndroid.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/BOverrideConvertAndroid.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Peter Abeles. All Rights Reserved. + * Copyright (c) 2024, Peter Abeles. All Rights Reserved. * * This file is part of BoofCV (http://boofcv.org). * @@ -20,7 +20,7 @@ import android.graphics.Bitmap; import android.media.Image; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import boofcv.alg.color.ColorFormat; import boofcv.override.BOverrideClass; import boofcv.override.BOverrideManager; diff --git a/integration/boofcv-android/src/main/java/boofcv/android/camera/CameraPreview.java b/integration/boofcv-android/src/main/java/boofcv/android/camera/CameraPreview.java index dac1bc5940..0410695494 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/camera/CameraPreview.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/camera/CameraPreview.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Peter Abeles. All Rights Reserved. + * Copyright (c) 2024, Peter Abeles. All Rights Reserved. * * This file is part of BoofCV (http://boofcv.org). * @@ -20,7 +20,7 @@ import android.content.Context; import android.hardware.Camera; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import android.view.SurfaceHolder; import android.view.SurfaceView; diff --git a/integration/boofcv-android/src/main/java/boofcv/android/camera/VideoDisplayActivity.java b/integration/boofcv-android/src/main/java/boofcv/android/camera/VideoDisplayActivity.java index e28586eaaa..622b8abdd5 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/camera/VideoDisplayActivity.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/camera/VideoDisplayActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Peter Abeles. All Rights Reserved. + * Copyright (c) 2024, Peter Abeles. All Rights Reserved. * * This file is part of BoofCV (http://boofcv.org). * @@ -25,7 +25,7 @@ import android.hardware.Camera; import android.os.Bundle; import android.os.Looper; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.Surface; import android.view.SurfaceView; import android.view.Window; diff --git a/integration/boofcv-android/src/main/java/boofcv/android/camera2/SimpleCamera2Activity.java b/integration/boofcv-android/src/main/java/boofcv/android/camera2/SimpleCamera2Activity.java index f8f2244666..10e5ea9973 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/camera2/SimpleCamera2Activity.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/camera2/SimpleCamera2Activity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Peter Abeles. All Rights Reserved. + * Copyright (c) 2024, Peter Abeles. All Rights Reserved. * * This file is part of BoofCV (http://boofcv.org). * @@ -31,8 +31,8 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.Looper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.DisplayMetrics; import android.util.Log; import android.util.Size; diff --git a/integration/boofcv-android/src/main/java/boofcv/android/camera2/VisualizeCamera2Activity.java b/integration/boofcv-android/src/main/java/boofcv/android/camera2/VisualizeCamera2Activity.java index 4a8df78f75..27ebdbba20 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/camera2/VisualizeCamera2Activity.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/camera2/VisualizeCamera2Activity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Peter Abeles. All Rights Reserved. + * Copyright (c) 2024, Peter Abeles. All Rights Reserved. * * This file is part of BoofCV (http://boofcv.org). * @@ -25,8 +25,8 @@ import android.graphics.PixelFormat; import android.media.Image; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import android.util.Size; import android.view.*;