update to android 4.0

build.gradle

@@ -2,15 +2,17 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:4.0.0-beta02'
 //        classpath 'com.google.gms:google-services:3.0.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }

facerecognition/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 29
+    buildToolsVersion '30.0.0 rc1'
 
     defaultConfig {
         applicationId "cultoftheunicorn.marvel"
-        minSdkVersion 15
-        targetSdkVersion 22
+        minSdkVersion 19
+        targetSdkVersion 29
     }
 
     buildTypes {
@@ -19,12 +19,12 @@ android {
 }
 
 dependencies {
-    compile project(':openCVLibrary2410')
-    compile files('libs/javacpp.jar')
-    compile files('libs/javacv.jar')
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha9'
-    compile 'com.android.support:recyclerview-v7:22.2.0'
+    implementation project(':openCVLibrary2410')
+    implementation files('libs/javacpp.jar')
+    implementation files('libs/javacv.jar')
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 //    compile 'com.google.firebase:firebase-database:10.0.1'
 }
 

facerecognition/src/main/AndroidManifest.xml

@@ -5,8 +5,6 @@
     android:versionCode="24"
     android:versionName="2.4">
 
-    <uses-sdk android:minSdkVersion="9" />
-
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <supports-screens

facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java

@@ -1,9 +1,9 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 

facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java

@@ -1,7 +1,7 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;

facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java

@@ -6,7 +6,7 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;

facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java

@@ -1,7 +1,7 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java

@@ -1,11 +1,11 @@
 package cultoftheunicorn.marvel;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 //import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;

facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java

@@ -6,7 +6,7 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.CompoundButton;

facerecognition/src/main/res/layout/activity_review_results.xml

@@ -17,7 +17,7 @@
         android:layout_centerHorizontal="true"
         android:textAllCaps="false" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

facerecognition/src/main/res/layout/home_app_bar.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

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\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

openCVLibrary2410/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "25.0.1"
+    compileSdkVersion 29
+    buildToolsVersion '30.0.0 rc1'
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 8
+        minSdkVersion 19
+        targetSdkVersion 29
     }
 
     buildTypes {

openCVLibrary2410/src/main/AndroidManifest.xml

@@ -4,5 +4,4 @@
       android:versionCode="24100"
       android:versionName="2.4.10">
 
-    <uses-sdk android:minSdkVersion="8" />
 </manifest>