Switch to AndroidX annotations

lessthanoptimal · Feb 5, 2024 · 329aad2 · 329aad2
1 parent 75094a6
commit 329aad2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...gration/boofcv-android/src/main/java/boofcv/android/camera2/VisualizeCamera2Activity.java b/...gration/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.*;