mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 15:53:03 +04:00
Merge branch 4.x
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
plugins {
|
||||
id 'com.android.library'
|
||||
id 'maven-publish'
|
||||
id 'kotlin-android'
|
||||
}
|
||||
|
||||
android {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
id 'com.android.library' version '7.3.0' apply false
|
||||
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ cmake_common_vars = {
|
||||
# Docs: https://developer.android.com/studio/releases/gradle-plugin
|
||||
'ANDROID_GRADLE_PLUGIN_VERSION': '7.3.1',
|
||||
'GRADLE_VERSION': '7.5.1',
|
||||
'KOTLIN_PLUGIN_VERSION': '1.5.20',
|
||||
'KOTLIN_PLUGIN_VERSION': '1.8.20',
|
||||
}
|
||||
ABIs = [
|
||||
ABI("2", "armeabi-v7a", None, ndk_api_level=ANDROID_NATIVE_API_LEVEL, cmake_vars=cmake_common_vars),
|
||||
|
||||
Reference in New Issue
Block a user