Upgrade to AndroidX, Gradle 6.1.1, Kotlin 1.3.72, NDK r21d, Android Build Tool 29.0.3 and Gradle Plugin 4.0.1.

Author: VlSomers

README.md

@@ -11,12 +11,12 @@ This sample Android application displays a live camera feed with an OpenCV *adap
 | Tool      | Version |
 | ---       |  ---    |
 | [OpenCV](https://opencv.org) | 4.4.0
-| [Android Studio](https://developer.android.com/studio) | 3.6.2
-| [Android Build Tool](https://developer.android.com/about) | 29.0.1
-| [Android NDK](https://developer.android.com/ndk/guides) | Revision r20
-| [Kotlin](https://kotlinlang.org/docs/reference/) | 1.3.50
-| [Gradle](https://gradle.org) | 5.4.1
-| Mac OS | 10.15.4
+| [Android Studio](https://developer.android.com/studio) | 4.0.1
+| [Android Build Tool](https://developer.android.com/about) | 29.0.3
+| [Android NDK](https://developer.android.com/ndk/guides) | r21d
+| [Kotlin](https://kotlinlang.org/docs/reference/) | 1.3.72
+| [Gradle](https://gradle.org) | 6.1.1
+| Mac OS | 10.15.6
 
 ## How to use this repository
 

app/build.gradle

@@ -5,15 +5,15 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "29.0.1"
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
     defaultConfig {
         applicationId "com.example.nativeopencvandroidtemplate"
         minSdkVersion 28
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         externalNativeBuild {
             cmake {
                 cppFlags "-frtti -fexceptions"
@@ -34,15 +34,16 @@ android {
             version "3.10.2"
         }
     }
+    ndkVersion '21.3.6528147'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation project(path: ':opencv')
 }

app/src/androidTest/java/com/example/nativeopencvandroidtemplate/ExampleInstrumentedTest.kt

@@ -1,7 +1,7 @@
 package com.example.nativeopencvandroidtemplate
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -18,7 +18,7 @@ class ExampleInstrumentedTest {
     @Test
     fun useAppContext() {
         // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.example.nativeopencvandroidtemplate", appContext.packageName)
     }
 }

app/src/main/java/com/example/nativeopencvandroidtemplate/MainActivity.java

@@ -4,7 +4,7 @@
 //import android.app.Activity;
 //import android.content.pm.PackageManager;
 //import android.os.Bundle;
-//import android.support.v4.app.ActivityCompat;
+//import androidx.core.app.ActivityCompat;
 //import android.util.Log;
 //import android.view.SurfaceView;
 //import android.view.WindowManager;

app/src/main/kotlin/com/example/nativeopencvandroidtemplate/MainActivity.kt

@@ -4,7 +4,7 @@ import android.Manifest
 import android.app.Activity
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.support.v4.app.ActivityCompat
+import androidx.core.app.ActivityCompat
 import android.util.Log
 import android.view.SurfaceView
 import android.view.WindowManager

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -13,5 +13,7 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.useAndroidX=true
+android.enableJetifier=true
 
-opencvsdk=/Users/Example/Downloads/OpenCV-android-sdk
+opencvsdk=/Users/Example/Downloads/OpenCV-android-sdk

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Sep 09 21:23:30 CEST 2019
+#Mon Aug 17 14:18:33 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip