migrate to androidx

Author: cyberb

build.gradle

@@ -2,17 +2,15 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
 }
 
 buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
     }
 }

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
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true

syncloud/build.gradle

@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    compileSdkVersion 30
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -11,9 +10,10 @@ android {
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
-        versionCode 20081
-        versionName "20.08.01"
+        targetSdkVersion 30
+        versionCode 21060
+        versionName "21.06"
+        multiDexEnabled true
     }
 
     useLibrary 'org.apache.http.legacy'
@@ -78,10 +78,10 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.3.3'
     implementation 'org.apache.commons:commons-lang3:3.3.2'
     implementation 'org.apache.httpcomponents:httpclient-android:4.3.3'
-    implementation 'com.google.guava:guava:18.0'
-    implementation 'com.android.support:design:27.0.2'
-    implementation 'com.android.support:support-v4:27.0.2'
-    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.google.guava:guava:24.1-jre'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.lsjwzh:materialloadingprogressbar:0.5.8-RELEASE'
     testImplementation 'junit:junit:4.10'
     testImplementation 'org.mockito:mockito-all:1.9.5'

syncloud/src/main/java/org/syncloud/android/AcraLogEmailer.java

@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.acra.ReportField;
 import org.acra.collections.ImmutableSet;

syncloud/src/main/java/org/syncloud/android/AcraLogEmailerFactory.java

@@ -1,7 +1,7 @@
 package org.syncloud.android;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.acra.config.CoreConfiguration;
 import org.acra.sender.ReportSender;

syncloud/src/main/java/org/syncloud/android/discovery/MulticastLock.java

@@ -20,7 +20,7 @@ public void acquire() {
         logger.info("creating multicast lock");
         try {
             lock = wifi.createMulticastLock(MULTICAST_LOCK_TAG);
-            lock.setReferenceCounted(false);
+            lock.setReferenceCounted(true);
             lock.acquire();
         } catch (Exception e) {
             logger.error("failed to acquire multicast lock", e);

syncloud/src/main/java/org/syncloud/android/ui/AuthCredentialsActivity.java

@@ -4,7 +4,7 @@
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.view.Menu;

syncloud/src/main/java/org/syncloud/android/ui/DevicesDiscoveryActivity.java

@@ -8,9 +8,9 @@
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

syncloud/src/main/java/org/syncloud/android/ui/DevicesSavedActivity.java

@@ -4,10 +4,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;

syncloud/src/main/java/org/syncloud/android/ui/SettingsActivity.java

@@ -3,17 +3,15 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
 import android.view.MenuInflater;
 import android.view.View;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatDelegate;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.appcompat.widget.Toolbar;
 import android.view.ViewGroup;
 
-import org.syncloud.android.R;
-
 public class SettingsActivity extends PreferenceActivity {
     private AppCompatDelegate mDelegate;