abhn · reizamv · Mar 16, 2020 · Aug 29, 2020
diff --git a/build.gradle b/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.1'
 //        classpath 'com.google.gms:google-services:3.0.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
diff --git a/facerecognition/build.gradle b/facerecognition/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "cultoftheunicorn.marvel"
-        minSdkVersion 15
-        targetSdkVersion 22
+        minSdkVersion 19
+        targetSdkVersion 30
     }
 
     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')
+    api files('libs/javacpp.jar')
+    api files('libs/javacv.jar')
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 //    compile 'com.google.firebase:firebase-database:10.0.1'
 }
 

diff --git a/facerecognition/src/main/AndroidManifest.xml b/facerecognition/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:versionCode="24"
     android:versionName="2.4">
 
-    <uses-sdk android:minSdkVersion="9" />
+
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 

diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/MainActivity.java
@@ -1,12 +1,15 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+
 import android.view.View;
 import android.widget.Button;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 import org.opencv.cultoftheunicorn.marvel.R;
 
 public class MainActivity extends AppCompatActivity {

diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/NameActivity.java
@@ -1,13 +1,15 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.opencv.cultoftheunicorn.marvel.R;
 
 public class NameActivity extends AppCompatActivity {

diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/Recognize.java b/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 android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -17,6 +17,8 @@
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.opencv.android.BaseLoaderCallback;
 import org.opencv.android.CameraBridgeViewBase;
 import org.opencv.android.LoaderCallbackInterface;

diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewListAdapter.java
@@ -1,13 +1,15 @@
 package cultoftheunicorn.marvel;
 
 import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.opencv.cultoftheunicorn.marvel.R;
 
 import java.util.List;

diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/ReviewResults.java
@@ -1,11 +1,9 @@
 package cultoftheunicorn.marvel;
 
-import android.support.v7.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 android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
@@ -14,6 +12,11 @@
 //import com.google.firebase.database.DatabaseReference;
 //import com.google.firebase.database.FirebaseDatabase;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.opencv.cultoftheunicorn.marvel.R;
 
 import java.util.ArrayList;

diff --git a/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java b/facerecognition/src/main/java/cultoftheunicorn/marvel/Training.java
@@ -6,14 +6,16 @@
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import org.opencv.android.BaseLoaderCallback;
 import org.opencv.android.CameraBridgeViewBase;
 import org.opencv.android.LoaderCallbackInterface;

diff --git a/facerecognition/src/main/res/layout/activity_main.xml b/facerecognition/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.opencv.cultoftheunicorn.marvel.cultoftheunicorn.marvel.MainActivity"
+
     android:background="@android:color/white">
 
     <include android:id="@+id/app_bar" layout="@layout/home_app_bar"/>

diff --git a/facerecognition/src/main/res/layout/activity_review_results.xml b/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"

diff --git a/facerecognition/src/main/res/layout/home_app_bar.xml b/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"

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sat Aug 29 21:59:52 CST 2020
 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
diff --git a/openCVLibrary2410/build.gradle b/openCVLibrary2410/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "25.0.1"
+    compileSdkVersion 30
+    buildToolsVersion "29.0.3"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 8
+        minSdkVersion 19
+        targetSdkVersion 30
     }
 
     buildTypes {

diff --git a/openCVLibrary2410/src/main/AndroidManifest.xml b/openCVLibrary2410/src/main/AndroidManifest.xml
@@ -4,5 +4,5 @@
       android:versionCode="24100"
       android:versionName="2.4.10">
 
-    <uses-sdk android:minSdkVersion="8" />
+
 </manifest>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		android.enableJetifier=true
		android.useAndroidX=true