Migrate to android-Q (#248)

2019-06-06 20:54:01 +02:00 · 2019-06-06 20:54:01 +02:00 · 52230f8f73
commit 52230f8f73
parent 3a9ced6c9f
27 changed files with 51 additions and 49 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -3,8 +3,8 @@ language: android
 jdk: oraclejdk8
 env:
  global:
-  - ANDROID_API=28
-  - ANDROID_BUILD_TOOLS=28.0.3
+  - ANDROID_API=29
+  - ANDROID_BUILD_TOOLS=29.0.0
  - secure: eY3bGKw4jZ+HHkkMBZHiL2dhcz+RJYHib0WC77SSVHLJcCg63pBvs420i4rjNQHycMs+PhRSlR79jdglDTm8svphhRjSts6VMkHDxObwJIyLF8vAZ0PfjhqfOXO+4+Fx6pRIjwM7cBMOQrDfSimJHRB+z/f2AJfUIsaMSlltGVya7nmrLY/fO4dtl4wPnejslj3mhnBAxr+a2Or978RwI2TMpxBovHZKFT/46wJTcMzKXGdXU64M8nmQmpcKHeIKIBiR4g+A2tahC+Us4tFxxoTDd3R+IAzj7Gvjd5JuMlYmQ3quRv2M08u9OJNiT14LpDXy19fZKdw/QNHg3S8JVis8kJDkv6z4HyZXTIBgISZpCZZti04GP29Lj+1f4ISRFc6uxankDuRgfX8ucsxoEPJVq3PfJlpTdP7wjlQtEGv0HF/3MNNyruNbLHFiCgHOANwEOX44INtw6XylPEftmw4y4ptntFG3VXyV1Zi+732Qe4b2QNTbvLPrsmkCRKzo59vKKAzBBhvYvFVITcWbySqdx9/n1H25SRL2Q96nPGQSQyBF6obzzFcjMKkknPle1PXvAfb171964cdIK6/zo9rh/ZCL3+gAKZibmGWvbeztWYl5ON8B8x8mgLO/qgPIotY+aqwmsY06pKrqi6adYZacMF+UgtbLJlhnird6ugk=
  - secure: EmcSyXk/5pEJhbRX9DSFzhQGYvGaYdxjDuQwmLuxUGitGpFQZbWexTAK/l0LLcIRsiSmucY7KJgOpL7I6odh2kVUZedarj8/5K1P69ljDDB7bfG8jyOLZvHJ1JTZRuKvUnT846zQwQWTnLXF9N4LaQ86FVqSW2bGHqptIivEjDEVh78V3g4PDsbX5aQ5LjTlSn7bezu9chpVS0fnRlqjAa6U2kUwUt+DDaSHEOs35Z89jT7JoonGFrMsyA7S26CQhOBYE3w76AllIea+MWzPJX3V364ZIzPBnQAkCz02oVI3n+LHZkzUCYHkY8DXWXNy6+/sulFa6L1v6bt8DzF1vwJ+nTNVqmqSDYBe2s1qAUZ+4o8l/THMndxC11LjbbEExG4ekBRFvRsOOf0pBps3Yr4ry27gaj4+9Ap2JCKKOQwm0izh48AJiy0Y8pzIzTO5wB5B7a4czLJmzaNWkPVXw4lKg2ldJ4sd6EBqUZqG2vRmN6VwHb8gHFNaQTH3feBRhYTpkv1wWUuhvclNn5yoZzcSxMT/b8d89e5DahoBYMW48c6jb5wL/EoY3bHp3mjtnTW8oIIjyZK8FjYX+8IqeEoue8bDDqNUN71xmRvp+0CX1iXnfgUeDWnYhXHTewOlJu6i509wGrZPxYjgwAdnpfTyGXPq7Vin9CkNHMw9fbA=
 before_cache:
--- a/SWADroid/build.gradle
+++ b/SWADroid/build.gradle
@ -25,27 +25,27 @@ def static getBuildConfigField(String property){
    return value
 }

-def build_param = "${build}";
+def build_param = "${build}"

 if (build_param != "prod") {
    //exclude development build
    android.variantFilter { variant ->
-        if (variant.buildType.name.equals('prod')) {
-            variant.setIgnore(true);
+        if (variant.buildType.name == 'prod') {
+            variant.setIgnore(true)
        }
    }
 } else {
    //exclude all except development build
    android.variantFilter { variant ->
-        if (!variant.buildType.name.equals('prod')) {
-            variant.setIgnore(true);
+        if (variant.buildType.name != 'prod') {
+            variant.setIgnore(true)
        }
    }
 }

 android {
-    compileSdkVersion "android-28"
-    buildToolsVersion '29.0.0-rc2'
+    compileSdkVersion "android-29"
+    buildToolsVersion '29.0.0'

    dexOptions {
        maxProcessCount=2
@ -62,7 +62,7 @@ android {
        versionName gitVersionName

        minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29

        testApplicationId "es.ugr.swad.swadroid.test"
        testInstrumentationRunner "android.test.InstrumentationTestRunner"
@ -79,13 +79,13 @@ android {
 }

 dependencies {
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
    implementation 'com.google.code.ksoap2-android:ksoap2-android:3.6.4'
    implementation 'commons-io:commons-io:2.6'
    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
    implementation 'com.journeyapps:zxing-android-embedded:3.6.0@aar'
    implementation 'com.google.zxing:core:3.3.3'
    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'com.google.firebase:firebase-core:16.0.8'
+    implementation 'com.google.firebase:firebase-core:16.0.9'
 }
--- a/SWADroid/src/main/AndroidManifest.xml
+++ b/SWADroid/src/main/AndroidManifest.xml
@ -342,7 +342,7 @@
        <service android:name="com.google.android.gms.analytics.CampaignTrackingService" />

        <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
            android:authorities="es.ugr.swad.swadroid.fileprovider"
            android:exported="false"
            android:grantUriPermissions="true">
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/AlertNotificationFactory.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/AlertNotificationFactory.java
@ -24,7 +24,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.graphics.BitmapFactory;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;

 import es.ugr.swad.swadroid.utils.NotificationUtils;

--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuActivity.java
@ -26,7 +26,7 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/MenuExpandableListActivity.java
@ -26,7 +26,7 @@ import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/SwipeListViewTouchListener.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/gui/SwipeListViewTouchListener.java
@ -24,7 +24,7 @@ import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.graphics.Rect;
 import android.os.Build;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccountActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/account/CreateAccountActivity.java
@ -22,7 +22,7 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java
@ -31,10 +31,10 @@ import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java
@ -21,8 +21,8 @@ package es.ugr.swad.swadroid.modules.groups;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.util.LongSparseArray;
+import androidx.core.content.ContextCompat;
+import androidx.collection.LongSparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/MyGroupsManager.java
@ -24,7 +24,7 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/LoginActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/login/LoginActivity.java
@ -21,7 +21,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.util.Log;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/Messages.java
@ -22,7 +22,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Paint;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/SearchUsers.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/messages/SearchUsers.java
@ -7,9 +7,9 @@ import android.content.res.Configuration;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.SearchView;
 import android.text.SpannableString;
 import android.text.style.StyleSpan;
 import android.util.Log;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/Notifications.java
@ -30,7 +30,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/notifications/NotificationsExpandableListAdapter.java
@ -20,7 +20,7 @@ package es.ugr.swad.swadroid.modules.notifications;

 import android.app.Activity;
 import android.graphics.Typeface;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/ContinuousCaptureActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/ContinuousCaptureActivity.java
@ -3,7 +3,7 @@ package es.ugr.swad.swadroid.modules.rollcall;
 import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/EventsCursorAdapter.java
@ -23,7 +23,7 @@ package es.ugr.swad.swadroid.modules.rollcall;
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Typeface;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/Rollcall.java
@ -27,7 +27,7 @@ import android.database.Cursor;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.View;
 import android.widget.AbsListView;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/rollcall/UsersActivity.java
@ -31,10 +31,10 @@ import android.database.Cursor;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/CheckedAnswersArrayAdapter.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/CheckedAnswersArrayAdapter.java
@ -20,7 +20,7 @@ package es.ugr.swad.swadroid.modules.tests;

 import android.content.Context;
 import android.graphics.Color;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
--- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsMake.java
+++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/tests/TestsMake.java
@ -23,8 +23,8 @@ import android.database.Cursor;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.MenuItemCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.MenuItemCompat;
 import android.text.InputType;
 import android.util.Log;
 import android.util.SparseBooleanArray;
--- a/SWADroid/src/main/res/layout/expandablelist_items_pulltorefresh.xml
+++ b/SWADroid/src/main/res/layout/expandablelist_items_pulltorefresh.xml
@ -9,7 +9,7 @@
        android:id="@+id/courseNameLayout"
        layout="@layout/course_or_group_name" />

-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/swipe_container_expandablelist"
        android:layout_width="match_parent"
        android:layout_height="match_parent" >
@ -30,6 +30,6 @@
                android:layout_height="match_parent"
                android:cacheColorHint="@color/background" />
        </LinearLayout>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

 </LinearLayout>
--- a/SWADroid/src/main/res/layout/list_items_pulltorefresh.xml
+++ b/SWADroid/src/main/res/layout/list_items_pulltorefresh.xml
@ -7,7 +7,7 @@

    <include layout="@layout/progress_screen" />

-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
        android:id="@+id/swipe_container_list"
        android:layout_width="match_parent"
        android:layout_height="match_parent" >
@ -29,6 +29,6 @@
                android:cacheColorHint="@color/background" >
            </ListView>
        </LinearLayout>
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

 </LinearLayout>
--- a/SWADroid/src/main/res/menu/search_users_bar.xml
+++ b/SWADroid/src/main/res/menu/search_users_bar.xml
@ -6,7 +6,7 @@
        android:id="@+id/action_search_field"
        android:icon="@drawable/ic_search_user"
        swadroid:showAsAction="ifRoom|collapseActionView"
-        swadroid:actionViewClass="android.support.v7.widget.SearchView"
+        swadroid:actionViewClass="androidx.appcompat.widget.SearchView"
        android:title="@string/search" />

    <item
--- a/build.gradle
+++ b/build.gradle
@ -5,7 +5,7 @@ buildscript {
        google()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
        classpath 'org.ajoberstar:grgit:2.1.1'
        classpath 'com.google.gms:google-services:4.2.0'
    }
--- a/gradle.properties
+++ b/gradle.properties
@ -11,6 +11,8 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2560M

 # When configured, Gradle will run in incubating parallel mode.