update libs

app/build.gradle

@@ -3,15 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
- compileSdkVersion 29
- buildToolsVersion "29.0.3"
+ compileSdkVersion 30
 
  ndkVersion "22.0.7026061"
 
  defaultConfig {
  applicationId "ru.gordinmitya.yuv2buf_demo"
  minSdkVersion 21
- targetSdkVersion 29
+ targetSdkVersion 30
  versionCode 1
  versionName "1.0"
 
@@ -51,19 +50,19 @@ android {
 
 dependencies {
  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'androidx.core:core-ktx:1.2.0'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.appcompat:appcompat:1.3.1'
+ implementation 'androidx.core:core-ktx:1.6.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
  // CameraX core library using the camera2 implementation
- def camerax_version = "1.1.0-alpha04"
+ def camerax_version = "1.1.0-alpha07"
  implementation "androidx.camera:camera-camera2:${camerax_version}"
  // If you want to additionally use the CameraX Lifecycle library
  implementation "androidx.camera:camera-lifecycle:${camerax_version}"
  // If you want to additionally use the CameraX View class
- implementation "androidx.camera:camera-view:1.0.0-alpha24"
+ implementation "androidx.camera:camera-view:1.0.0-alpha27"
  // If you want to additionally use the CameraX Extensions library
- implementation "androidx.camera:camera-extensions:1.0.0-alpha24"
+ implementation "androidx.camera:camera-extensions:1.0.0-alpha27"
 
  implementation project(path: ':yuv2buf')
 

app/src/main/CMakeLists.txt

@@ -6,7 +6,7 @@ add_library(MNN SHARED IMPORTED)
 set_target_properties(
  MNN
  PROPERTIES IMPORTED_LOCATION
- ${CMAKE_SOURCE_DIR}/jniLibs/${ANDROID_ABI}/libMNN.so
+ ${CMAKE_SOURCE_DIR}/jni/${ANDROID_ABI}/libMNN.so
 )
 
 file(GLOB_RECURSE CPP_SRCS

build.gradle

@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
- ext.kotlin_version = '1.3.71'
+ ext.kotlin_version = '1.4.32'
  repositories {
  google()
- jcenter()
-
+ mavenCentral()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.6.3'
+ classpath 'com.android.tools.build:gradle:4.1.3'
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
  // NOTE: Do not place your application dependencies here; they belong
@@ -19,8 +18,8 @@ buildscript {
 allprojects {
  repositories {
  google()
- jcenter()
-
+ mavenCentral()
+ jcenter() // necessary for quickbirdstudios opencv
  }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.1.1-all.zip