From bb82f4e8931c3bffab96413a66e49fab4ac059f8 Mon Sep 17 00:00:00 2001
From: Jhon Magdalena <jfmv.vt@gmail.com>
Date: Wed, 23 Sep 2020 00:56:48 +0200
Subject: [PATCH] Upgrade to androidx

---
 .gitignore                                    |  2 ++
 .idea/gradle.xml                              |  2 ++
 .idea/jarRepositories.xml                     | 25 +++++++++++++++++++
 .idea/misc.xml                                | 21 +++++++++++++---
 .idea/modules.xml                             |  2 ++
 app/build.gradle                              | 15 ++++++-----
 .../connect4/activity/GameMenuActivity.java   |  4 +--
 .../connect4/activity/GamePlayActivity.java   |  6 ++---
 .../connect4/activity/SplashActivity.java     |  2 +-
 .../overrideandroid/connect4/ai/AiPlayer.java |  2 +-
 .../connect4/board/BoardLogic.java            |  2 +-
 .../controller/GameMenuController.java        |  2 +-
 .../controller/GamePlayController.java        |  4 +--
 .../connect4/rules/GameRules.java             |  2 +-
 .../connect4/view/BoardView.java              |  2 +-
 .../connect4/view/MenuView.java               |  2 +-
 build.gradle                                  |  4 ++-
 gradle.properties                             |  2 ++
 gradle/wrapper/gradle-wrapper.properties      |  4 +--
 19 files changed, 77 insertions(+), 28 deletions(-)
 create mode 100644 .idea/jarRepositories.xml

diff --git a/.gitignore b/.gitignore
index 39fb081..a22da44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
 /build
 /captures
 .externalNativeBuild
+.idea/codeStyles
+/.idea/caches/
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..5cd135a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..a5f05cd
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4a04528..dd67e70 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,26 +5,41 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b4d13f8..862e6c2 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,6 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Connect4Android.iml" filepath="$PROJECT_DIR$/.idea/modules/Connect4Android.iml" group="Connect4Android" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Connect4Android-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Connect4Android-app.iml" group="Connect4Android/app" />
       <module fileurl="file://$PROJECT_DIR$/Connect4_Android.iml" filepath="$PROJECT_DIR$/Connect4_Android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
diff --git a/app/build.gradle b/app/build.gradle
index 168f5a2..437a011 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,15 +2,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 30
     defaultConfig {
         applicationId "info.overrideandroid.connect4"
         minSdkVersion 18
-        targetSdkVersion 25
+        targetSdkVersion 30
         versionCode 3
         versionName "1.2"
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
      lintOptions {
         abortOnError false
@@ -27,12 +26,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.2.0'
 
     // Unit testing dependencies
-    testCompile 'junit:junit:4.12'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
 }
diff --git a/app/src/main/java/info/overrideandroid/connect4/activity/GameMenuActivity.java b/app/src/main/java/info/overrideandroid/connect4/activity/GameMenuActivity.java
index 4e26bf6..96c9dc3 100644
--- a/app/src/main/java/info/overrideandroid/connect4/activity/GameMenuActivity.java
+++ b/app/src/main/java/info/overrideandroid/connect4/activity/GameMenuActivity.java
@@ -1,10 +1,10 @@
 package info.overrideandroid.connect4.activity;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import info.overrideandroid.connect4.R;
 import info.overrideandroid.connect4.controller.GameMenuController;
 import info.overrideandroid.connect4.rules.GameRules;
diff --git a/app/src/main/java/info/overrideandroid/connect4/activity/GamePlayActivity.java b/app/src/main/java/info/overrideandroid/connect4/activity/GamePlayActivity.java
index 4053bbb..be4cc76 100644
--- a/app/src/main/java/info/overrideandroid/connect4/activity/GamePlayActivity.java
+++ b/app/src/main/java/info/overrideandroid/connect4/activity/GamePlayActivity.java
@@ -2,12 +2,12 @@
 
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
 import info.overrideandroid.connect4.R;
 import info.overrideandroid.connect4.controller.GamePlayController;
 import info.overrideandroid.connect4.rules.GameRules;
diff --git a/app/src/main/java/info/overrideandroid/connect4/activity/SplashActivity.java b/app/src/main/java/info/overrideandroid/connect4/activity/SplashActivity.java
index 02fb221..6bd250b 100644
--- a/app/src/main/java/info/overrideandroid/connect4/activity/SplashActivity.java
+++ b/app/src/main/java/info/overrideandroid/connect4/activity/SplashActivity.java
@@ -3,8 +3,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
 
+import androidx.appcompat.app.AppCompatActivity;
 import info.overrideandroid.connect4.R;
 import info.overrideandroid.connect4.utils.Constants;
 
diff --git a/app/src/main/java/info/overrideandroid/connect4/ai/AiPlayer.java b/app/src/main/java/info/overrideandroid/connect4/ai/AiPlayer.java
index 1128d9a..6a46bda 100644
--- a/app/src/main/java/info/overrideandroid/connect4/ai/AiPlayer.java
+++ b/app/src/main/java/info/overrideandroid/connect4/ai/AiPlayer.java
@@ -1,8 +1,8 @@
 package info.overrideandroid.connect4.ai;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import info.overrideandroid.connect4.BuildConfig;
 import info.overrideandroid.connect4.board.BoardLogic;
 import info.overrideandroid.connect4.controller.GamePlayController;
diff --git a/app/src/main/java/info/overrideandroid/connect4/board/BoardLogic.java b/app/src/main/java/info/overrideandroid/connect4/board/BoardLogic.java
index 0196920..d82cae2 100644
--- a/app/src/main/java/info/overrideandroid/connect4/board/BoardLogic.java
+++ b/app/src/main/java/info/overrideandroid/connect4/board/BoardLogic.java
@@ -1,11 +1,11 @@
 package info.overrideandroid.connect4.board;
 
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.widget.ImageView;
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
 import info.overrideandroid.connect4.BuildConfig;
 import info.overrideandroid.connect4.controller.GamePlayController;
 import info.overrideandroid.connect4.rules.Player;
diff --git a/app/src/main/java/info/overrideandroid/connect4/controller/GameMenuController.java b/app/src/main/java/info/overrideandroid/connect4/controller/GameMenuController.java
index d1919b5..b5a0b27 100644
--- a/app/src/main/java/info/overrideandroid/connect4/controller/GameMenuController.java
+++ b/app/src/main/java/info/overrideandroid/connect4/controller/GameMenuController.java
@@ -1,10 +1,10 @@
 package info.overrideandroid.connect4.controller;
 
-import android.support.annotation.NonNull;
 import android.view.View;
 import android.widget.RadioGroup;
 import android.widget.SeekBar;
 
+import androidx.annotation.NonNull;
 import info.overrideandroid.connect4.R;
 import info.overrideandroid.connect4.rules.GameRules;
 import info.overrideandroid.connect4.rules.GameRules.Disc;
diff --git a/app/src/main/java/info/overrideandroid/connect4/controller/GamePlayController.java b/app/src/main/java/info/overrideandroid/connect4/controller/GamePlayController.java
index e48ab22..e45e457 100644
--- a/app/src/main/java/info/overrideandroid/connect4/controller/GamePlayController.java
+++ b/app/src/main/java/info/overrideandroid/connect4/controller/GamePlayController.java
@@ -2,14 +2,14 @@
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import info.overrideandroid.connect4.BuildConfig;
 import info.overrideandroid.connect4.activity.GamePlayActivity;
 import info.overrideandroid.connect4.ai.AiPlayer;
diff --git a/app/src/main/java/info/overrideandroid/connect4/rules/GameRules.java b/app/src/main/java/info/overrideandroid/connect4/rules/GameRules.java
index d962001..e9d90e0 100644
--- a/app/src/main/java/info/overrideandroid/connect4/rules/GameRules.java
+++ b/app/src/main/java/info/overrideandroid/connect4/rules/GameRules.java
@@ -1,8 +1,8 @@
 package info.overrideandroid.connect4.rules;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import info.overrideandroid.connect4.R;
 
 /**
diff --git a/app/src/main/java/info/overrideandroid/connect4/view/BoardView.java b/app/src/main/java/info/overrideandroid/connect4/view/BoardView.java
index 9874178..e3499db 100644
--- a/app/src/main/java/info/overrideandroid/connect4/view/BoardView.java
+++ b/app/src/main/java/info/overrideandroid/connect4/view/BoardView.java
@@ -1,7 +1,6 @@
 package info.overrideandroid.connect4.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
@@ -13,6 +12,7 @@
 
 import java.util.ArrayList;
 
+import androidx.annotation.NonNull;
 import info.overrideandroid.connect4.BuildConfig;
 import info.overrideandroid.connect4.R;
 import info.overrideandroid.connect4.board.BoardLogic;
diff --git a/app/src/main/java/info/overrideandroid/connect4/view/MenuView.java b/app/src/main/java/info/overrideandroid/connect4/view/MenuView.java
index ce79045..b1a1859 100644
--- a/app/src/main/java/info/overrideandroid/connect4/view/MenuView.java
+++ b/app/src/main/java/info/overrideandroid/connect4/view/MenuView.java
@@ -1,13 +1,13 @@
 package info.overrideandroid.connect4.view;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 
+import androidx.annotation.NonNull;
 import info.overrideandroid.connect4.R;
 import info.overrideandroid.connect4.controller.GameMenuController;
 import info.overrideandroid.connect4.rules.GameRules;
diff --git a/build.gradle b/build.gradle
index d143f69..a6ad490 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.4.0-alpha7'
+        classpath 'com.android.tools.build:gradle:4.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8d89bd2..a52c45c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 29 10:47:40 IST 2017
+#Wed Sep 23 00:47:01 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip