From 581e91c6303d7811127380430204360869e3ec49 Mon Sep 17 00:00:00 2001
From: Andriy Druk <andriy.druk@gmail.com>
Date: Mon, 12 Nov 2018 09:53:36 +0200
Subject: [PATCH] Dev: migrate to androidx

---
 app/build.gradle                                          | 6 +++---
 .../java/com/github/druk/dnssdsamples/DNSSDActivity.java  | 8 ++++----
 .../java/com/github/druk/dnssdsamples/MainActivity.java   | 8 ++++----
 .../java/com/github/druk/dnssdsamples/ServiceAdapter.java | 4 ++--
 app/src/main/res/layout/activity_main.xml                 | 6 +++---
 app/src/main/res/layout/two_text_item.xml                 | 6 +++---
 build.gradle                                              | 4 ++--
 gradle.properties                                         | 4 +++-
 rx2dnssd/build.gradle                                     | 2 +-
 .../java/com/github/druk/rx2dnssd/BonjourService.java     | 4 ++--
 .../src/main/java/com/github/druk/rx2dnssd/Rx2Dnssd.java  | 2 +-
 .../java/com/github/druk/rx2dnssd/Rx2DnssdCommon.java     | 2 +-
 rxdnssd/build.gradle                                      | 2 +-
 .../main/java/com/github/druk/rxdnssd/BonjourService.java | 4 ++--
 .../src/main/java/com/github/druk/rxdnssd/RxDnssd.java    | 2 +-
 .../main/java/com/github/druk/rxdnssd/RxDnssdCommon.java  | 2 +-
 16 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c5209b7..782f49e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,9 +30,9 @@ android {
 dependencies {
     implementation project(':rx2dnssd')
     //implementation 'com.github.andriydruk:rx2dnssd:0.9.8-beta1'
-    implementation 'com.android.support:appcompat-v7:28.0.0-rc01'
-    implementation 'com.android.support:design:28.0.0-rc01'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
 
     testImplementation 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/com/github/druk/dnssdsamples/DNSSDActivity.java b/app/src/main/java/com/github/druk/dnssdsamples/DNSSDActivity.java
index 77f6fc4..bbea788 100644
--- a/app/src/main/java/com/github/druk/dnssdsamples/DNSSDActivity.java
+++ b/app/src/main/java/com/github/druk/dnssdsamples/DNSSDActivity.java
@@ -4,10 +4,10 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/com/github/druk/dnssdsamples/MainActivity.java b/app/src/main/java/com/github/druk/dnssdsamples/MainActivity.java
index ef7945f..8565274 100644
--- a/app/src/main/java/com/github/druk/dnssdsamples/MainActivity.java
+++ b/app/src/main/java/com/github/druk/dnssdsamples/MainActivity.java
@@ -6,10 +6,10 @@
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
diff --git a/app/src/main/java/com/github/druk/dnssdsamples/ServiceAdapter.java b/app/src/main/java/com/github/druk/dnssdsamples/ServiceAdapter.java
index d25afab..13d04f8 100644
--- a/app/src/main/java/com/github/druk/dnssdsamples/ServiceAdapter.java
+++ b/app/src/main/java/com/github/druk/dnssdsamples/ServiceAdapter.java
@@ -17,8 +17,8 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.RequiresApi;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c6b1132..52cfcb9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
@@ -51,7 +51,7 @@
             app:layout_constraintTop_toBottomOf="@+id/browse"
             app:layout_constraintHorizontal_bias="0.0"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="0dp"
             android:layout_height="0dp"
@@ -68,6 +68,6 @@
             android:layout_marginStart="8dp"
             android:layout_marginEnd="8dp"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
 
 
diff --git a/app/src/main/res/layout/two_text_item.xml b/app/src/main/res/layout/two_text_item.xml
index ec49c01..760cb22 100644
--- a/app/src/main/res/layout/two_text_item.xml
+++ b/app/src/main/res/layout/two_text_item.xml
@@ -25,7 +25,7 @@
         android:paddingEnd="@dimen/activity_horizontal_margin"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -33,14 +33,14 @@
             android:textColor="@color/primary_text"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/secondary_text"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/text3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/build.gradle b/build.gradle
index 3e715ec..dedaed8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index 1d3591c..915f0e6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # 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
\ No newline at end of file
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/rx2dnssd/build.gradle b/rx2dnssd/build.gradle
index b788efa..ce43d7b 100644
--- a/rx2dnssd/build.gradle
+++ b/rx2dnssd/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     // Transitively export that dependencies to other modules
     api 'io.reactivex.rxjava2:rxandroid:2.1.0'
     api 'io.reactivex.rxjava2:rxjava:2.2.1'
-    api 'com.android.support:support-annotations:27.0.2'
+    api 'androidx.annotation:annotation:1.0.0'
 
     testImplementation 'junit:junit:4.12'
     // Last version that support Power Mock: https://github.com/powermock/powermock/wiki/Mockito#supported-versions
diff --git a/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/BonjourService.java b/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/BonjourService.java
index 2406b7e..9f39e90 100644
--- a/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/BonjourService.java
+++ b/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/BonjourService.java
@@ -17,8 +17,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;
diff --git a/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/Rx2Dnssd.java b/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/Rx2Dnssd.java
index 96d13d1..2a5ce55 100644
--- a/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/Rx2Dnssd.java
+++ b/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/Rx2Dnssd.java
@@ -15,7 +15,7 @@
  */
 package com.github.druk.rx2dnssd;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.github.druk.dnssd.DNSSD;
 
diff --git a/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/Rx2DnssdCommon.java b/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/Rx2DnssdCommon.java
index bbf74e5..09f4454 100644
--- a/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/Rx2DnssdCommon.java
+++ b/rx2dnssd/src/main/java/com/github/druk/rx2dnssd/Rx2DnssdCommon.java
@@ -7,7 +7,7 @@
 import com.github.druk.dnssd.NSType;
 import com.github.druk.dnssd.TXTRecord;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Map;
 
diff --git a/rxdnssd/build.gradle b/rxdnssd/build.gradle
index b06a52b..7be15aa 100644
--- a/rxdnssd/build.gradle
+++ b/rxdnssd/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     // Transitively export that dependencies to other modules
     api 'io.reactivex:rxandroid:1.2.1'
     api 'io.reactivex:rxjava:1.3.8'
-    api 'com.android.support:support-annotations:27.0.2'
+    api 'androidx.annotation:annotation:1.0.0'
 
     testImplementation 'junit:junit:4.12'
     // Last version that support Power Mock: https://github.com/powermock/powermock/wiki/Mockito#supported-versions
diff --git a/rxdnssd/src/main/java/com/github/druk/rxdnssd/BonjourService.java b/rxdnssd/src/main/java/com/github/druk/rxdnssd/BonjourService.java
index b1a3eb4..5f7c90b 100644
--- a/rxdnssd/src/main/java/com/github/druk/rxdnssd/BonjourService.java
+++ b/rxdnssd/src/main/java/com/github/druk/rxdnssd/BonjourService.java
@@ -17,8 +17,8 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;
diff --git a/rxdnssd/src/main/java/com/github/druk/rxdnssd/RxDnssd.java b/rxdnssd/src/main/java/com/github/druk/rxdnssd/RxDnssd.java
index aa7f646..1254c88 100644
--- a/rxdnssd/src/main/java/com/github/druk/rxdnssd/RxDnssd.java
+++ b/rxdnssd/src/main/java/com/github/druk/rxdnssd/RxDnssd.java
@@ -15,7 +15,7 @@
  */
 package com.github.druk.rxdnssd;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.github.druk.dnssd.DNSSD;
 
diff --git a/rxdnssd/src/main/java/com/github/druk/rxdnssd/RxDnssdCommon.java b/rxdnssd/src/main/java/com/github/druk/rxdnssd/RxDnssdCommon.java
index fbeb928..5c9cb25 100644
--- a/rxdnssd/src/main/java/com/github/druk/rxdnssd/RxDnssdCommon.java
+++ b/rxdnssd/src/main/java/com/github/druk/rxdnssd/RxDnssdCommon.java
@@ -1,6 +1,6 @@
 package com.github.druk.rxdnssd;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.github.druk.dnssd.DNSSD;
 import com.github.druk.dnssd.DNSSDException;