Migrate OpenCV to Maven (#1839)

Fate-Grand-Automata · Nov 21, 2024 · f8a64a6 · f8a64a6
1 parent 8609c8b
commit f8a64a6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,6 @@ If you want to contribute, read the [Contribution Guide](CONTRIBUTING.md).
 ## Acknowledgements
 
 - [FGO-Lua][FGOLua] developers are the real deal. Without them this app won't exist.
-- We're using OpenCV Android package from: https://github.com/iamareebjamal/opencv-android
 - The icons are from https://materialdesignicons.com/
 - Drag-sort logic on Card Priority screen is thanks to https://medium.com/@ipaulpro/drag-and-swipe-with-recyclerview-6a6f0c422efd
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -105,7 +105,7 @@ dependencies {
     implementation(libs.androidx.recyclerview)
     implementation(libs.androidx.constraintlayout)
 
-    implementation(libs.opencv.android)
+    implementation(libs.opencv)
     implementation(libs.tesseract4android)
 
     implementation(libs.lifecycle.viewmodel.ktx)

diff --git a/app/src/main/java/io/github/fate_grand_automata/util/AutomataApplication.kt b/app/src/main/java/io/github/fate_grand_automata/util/AutomataApplication.kt
@@ -14,7 +14,7 @@ class AutomataApplication : Application() {
 
         initLogging()
 
-        OpenCVLoader.initDebug()
+        OpenCVLoader.initLocal()
     }
 
     private fun initLogging() {
@@ -26,4 +26,4 @@ class AutomataApplication : Application() {
             return if (BuildConfig.DEBUG) true else priority > Log.INFO
         }
     }
-}
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -25,8 +25,10 @@ google_android_play_version = "2.1.0"
 
 activity_version = "1.9.2"
 mockk_version = "1.13.12"
+
+opencv_version = "4.10.0"
 navigation_compose_version = "2.8.1"
-opencv_android_version = "4.8.1r2"
+
 recyclerview_version = "1.3.2"
 tesseract4android_version = "4.7.0"
 
@@ -87,7 +89,7 @@ androidx-documentfile = { module = "androidx.documentfile:documentfile", version
 androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview_version" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout_version" }
 
-opencv-android = { module = "com.github.animeavi:opencv-android", version.ref = "opencv_android_version" }
+opencv = { group = "org.opencv", name = "opencv", version.ref = "opencv_version" }
 tesseract4android = { module = "cz.adaptech.tesseract4android:tesseract4android", version.ref = "tesseract4android_version" }
 
 junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit_bom_version" }