From 4fc704604b4ed00c5637dd6fb475cb28ecdea00e Mon Sep 17 00:00:00 2001
From: Olga Miller <olga.rgb@gmail.com>
Date: Thu, 18 Jun 2020 22:35:44 +0200
Subject: [PATCH] Gradle updates 29, with necessary replacement of
 android.support by androidx

---
 app/build.gradle                                     |  8 ++++----
 app/src/main/AndroidManifest.xml                     |  2 +-
 app/src/main/java/om/sstvencoder/ColorFragment.java  |  4 ++--
 .../sstvencoder/ColorPalette/ColorPaletteView.java   |  2 +-
 app/src/main/java/om/sstvencoder/CropView.java       |  6 +++---
 .../main/java/om/sstvencoder/EditTextActivity.java   |  8 ++++----
 app/src/main/java/om/sstvencoder/FontFamilySet.java  |  2 +-
 app/src/main/java/om/sstvencoder/MainActivity.java   | 12 ++++++------
 .../java/om/sstvencoder/TextOverlay/IWriter.java     |  2 +-
 .../om/sstvencoder/TextOverlay/LabelCollection.java  |  2 +-
 .../om/sstvencoder/TextOverlay/LabelContainer.java   |  2 +-
 .../om/sstvencoder/TextOverlay/LabelPainter.java     |  2 +-
 .../java/om/sstvencoder/TextOverlayTemplate.java     |  2 +-
 app/src/main/java/om/sstvencoder/Utility.java        |  6 +++---
 app/src/main/res/layout/activity_edit_text.xml       |  4 ++--
 build.gradle                                         |  2 +-
 gradle.properties                                    |  3 ++-
 gradle/wrapper/gradle-wrapper.properties             |  2 +-
 18 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 34b07a9..7a3d58f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "om.sstvencoder"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 24
         versionName "2.3"
     }
@@ -19,6 +19,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation "com.android.support:exifinterface:28.0.0"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation "androidx.exifinterface:exifinterface:1.2.0"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 00be8dd..9e9d219 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="om.sstvencoder"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/app/src/main/java/om/sstvencoder/ColorFragment.java b/app/src/main/java/om/sstvencoder/ColorFragment.java
index fb4d174..0ce0840 100644
--- a/app/src/main/java/om/sstvencoder/ColorFragment.java
+++ b/app/src/main/java/om/sstvencoder/ColorFragment.java
@@ -19,8 +19,8 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
 import android.view.View;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/om/sstvencoder/ColorPalette/ColorPaletteView.java b/app/src/main/java/om/sstvencoder/ColorPalette/ColorPaletteView.java
index 997e4de..0be1e0c 100644
--- a/app/src/main/java/om/sstvencoder/ColorPalette/ColorPaletteView.java
+++ b/app/src/main/java/om/sstvencoder/ColorPalette/ColorPaletteView.java
@@ -19,7 +19,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/app/src/main/java/om/sstvencoder/CropView.java b/app/src/main/java/om/sstvencoder/CropView.java
index bca37af..08b61ce 100644
--- a/app/src/main/java/om/sstvencoder/CropView.java
+++ b/app/src/main/java/om/sstvencoder/CropView.java
@@ -25,9 +25,9 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.NonNull;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
diff --git a/app/src/main/java/om/sstvencoder/EditTextActivity.java b/app/src/main/java/om/sstvencoder/EditTextActivity.java
index c12c096..2b1ac82 100644
--- a/app/src/main/java/om/sstvencoder/EditTextActivity.java
+++ b/app/src/main/java/om/sstvencoder/EditTextActivity.java
@@ -18,10 +18,10 @@ package om.sstvencoder;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.ColorInt;
+import androidx.fragment.app.DialogFragment;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
diff --git a/app/src/main/java/om/sstvencoder/FontFamilySet.java b/app/src/main/java/om/sstvencoder/FontFamilySet.java
index 9ce4820..8d08949 100644
--- a/app/src/main/java/om/sstvencoder/FontFamilySet.java
+++ b/app/src/main/java/om/sstvencoder/FontFamilySet.java
@@ -15,7 +15,7 @@ limitations under the License.
 */
 package om.sstvencoder;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Xml;
 
 import org.xmlpull.v1.XmlPullParser;
diff --git a/app/src/main/java/om/sstvencoder/MainActivity.java b/app/src/main/java/om/sstvencoder/MainActivity.java
index f56080a..48cfb33 100644
--- a/app/src/main/java/om/sstvencoder/MainActivity.java
+++ b/app/src/main/java/om/sstvencoder/MainActivity.java
@@ -24,16 +24,16 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.support.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.system.ErrnoException;
 import android.system.OsConstants;
 import android.view.Menu;
diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/IWriter.java b/app/src/main/java/om/sstvencoder/TextOverlay/IWriter.java
index 2fcebb8..90e4ca8 100644
--- a/app/src/main/java/om/sstvencoder/TextOverlay/IWriter.java
+++ b/app/src/main/java/om/sstvencoder/TextOverlay/IWriter.java
@@ -15,7 +15,7 @@ limitations under the License.
 */
 package om.sstvencoder.TextOverlay;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java b/app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java
index c717f85..a99d46c 100644
--- a/app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java
+++ b/app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java
@@ -17,7 +17,7 @@ package om.sstvencoder.TextOverlay;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 import java.util.LinkedList;
diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java b/app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java
index f7684ef..2b5bb22 100644
--- a/app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java
+++ b/app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java
@@ -17,7 +17,7 @@ package om.sstvencoder.TextOverlay;
 
 import android.graphics.Canvas;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 
diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java b/app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java
index 03400e0..c5ab239 100644
--- a/app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java
+++ b/app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java
@@ -22,7 +22,7 @@ import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Typeface;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 class LabelPainter {
     private interface IDrawer {
diff --git a/app/src/main/java/om/sstvencoder/TextOverlayTemplate.java b/app/src/main/java/om/sstvencoder/TextOverlayTemplate.java
index c439f1c..a17ae69 100644
--- a/app/src/main/java/om/sstvencoder/TextOverlayTemplate.java
+++ b/app/src/main/java/om/sstvencoder/TextOverlayTemplate.java
@@ -15,7 +15,7 @@ limitations under the License.
 */
 package om.sstvencoder;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.JsonReader;
 import android.util.JsonToken;
 import android.util.JsonWriter;
diff --git a/app/src/main/java/om/sstvencoder/Utility.java b/app/src/main/java/om/sstvencoder/Utility.java
index d397ef0..40df99b 100644
--- a/app/src/main/java/om/sstvencoder/Utility.java
+++ b/app/src/main/java/om/sstvencoder/Utility.java
@@ -19,13 +19,13 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
-import android.support.media.ExifInterface;
+import androidx.exifinterface.media.ExifInterface;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/res/layout/activity_edit_text.xml b/app/src/main/res/layout/activity_edit_text.xml
index d3e784c..07259bd 100644
--- a/app/src/main/res/layout/activity_edit_text.xml
+++ b/app/src/main/res/layout/activity_edit_text.xml
@@ -86,7 +86,7 @@
                 android:id="@+id/edit_text_size"
                 android:layout_width="50dp"/>
 
-            <android.support.v4.widget.Space
+            <Space
                 android:layout_width="0dp"/>
 
             <TextView
@@ -121,7 +121,7 @@
 
             </LinearLayout>
 
-            <android.support.v4.widget.Space
+            <Space
                 android:layout_width="0dp"/>
 
             <TextView
diff --git a/build.gradle b/build.gradle
index e006ab4..032b62c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.0.0'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 82618ce..5cd40bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,5 +11,6 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-
+android.useAndroidX=true
+android.enableJetifier=true
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9a4163a..4e1cc9d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists