Bump deps

.travis.yml

@@ -15,7 +15,7 @@ android:
     - tools
     - build-tools-28.0.3
     - android-24
-    - android-26
+    - android-28
     - extra
     - extra-android-m2repository
     - sys-img-armeabi-v7a-android-24

dependencies.gradle

@@ -1,13 +1,12 @@
-def support_lib_version = '26.1.0'
 def jems_version = '1.18'
 def contentpal_version = 'a7fbc62eef' //  a7fbc62eef -> 2018-08-19
-def support_test_runner_version = '0.5'
+def androidx_test_runner_version = '1.1.1'
 
 ext.deps = [
         // Support & Google libraries
-        support_appcompat  : "com.android.support:appcompat-v7:$support_lib_version",
-        support_annotations: "com.android.support:support-annotations:$support_lib_version",
-        support_design     : "com.android.support:design:$support_lib_version",
+        support_appcompat  : 'androidx.appcompat:appcompat:1.0.2',
+        support_annotations: 'androidx.annotation:annotation:1.0.0',
+        support_design     : 'com.google.android.material:material:1.0.0',
         android_dashclock  : 'com.google.android.apps.dashclock:dashclock-api:2.0.0',
 
         // dmfs
@@ -26,10 +25,10 @@ ext.deps = [
         // Testing
         junit              : 'junit:junit:4.12',
         hamcrest           : 'org.hamcrest:hamcrest-all:1.3',
-        mockito            : 'org.mockito:mockito-core:2.10.0',
+        mockito            : 'org.mockito:mockito-core:2.27.0',
         robolectric        : 'org.robolectric:robolectric:3.5.1',
-        support_test_runner: "com.android.support.test:runner:$support_test_runner_version",
-        support_test_rules : "com.android.support.test:rules:$support_test_runner_version",
+        support_test_runner: "androidx.test:runner:$androidx_test_runner_version",
+        support_test_rules : "androidx.test:rules:$androidx_test_runner_version",
 
         // dmfs testing
         jems_testing       : "org.dmfs:jems-testing:$jems_version",

gradle.properties

@@ -1,4 +1,6 @@
-COMPILE_SDK_VERSION=26
+COMPILE_SDK_VERSION=28
 MIN_SDK_VERSION=15
 TARGET_SDK_VERSION=26
 VERSION_OVERRIDE=0
+android.enableJetifier=true
+android.useAndroidX=true

opentasks-contract/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {

opentasks-provider/build.gradle

@@ -7,7 +7,7 @@ android {
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
     buildTypes {

opentasks-provider/src/androidTest/java/org/dmfs/provider/tasks/TaskProviderInstancesTest.java

@@ -21,8 +21,8 @@
 import android.content.OperationApplicationException;
 import android.os.Build;
 import android.os.RemoteException;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.dmfs.android.contentpal.Operation;
 import org.dmfs.android.contentpal.OperationsQueue;

opentasks-provider/src/androidTest/java/org/dmfs/provider/tasks/TaskProviderTest.java

@@ -21,8 +21,8 @@
 import android.content.ContentValues;
 import android.content.Context;
 import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.dmfs.android.contentpal.Operation;
 import org.dmfs.android.contentpal.OperationsQueue;

opentasks/build.gradle

@@ -21,7 +21,7 @@ android {
         // spread version code to allow inserting versions if necessary
         versionCode gitCommitNo('refs/remotes/origin/master') * 99 + gitCommitNo('HEAD') + Integer.parseInt(VERSION_OVERRIDE)
         versionName version
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     if (project.hasProperty("DMFS_RELEASE_KEYSTORE")) {
         signingConfigs {
@@ -74,7 +74,6 @@ dependencies {
     }
     implementation(deps.android_carrot) {
         exclude module: 'carrot'
-        exclude group: 'com.android.support'
         exclude module: 'iterators'
         exclude module: 'jems'
     }
@@ -86,12 +85,8 @@ dependencies {
     testImplementation deps.robolectric
     testImplementation deps.jems_testing
 
-    androidTestImplementation(deps.support_test_runner) {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    androidTestImplementation(deps.support_test_rules) {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
+    androidTestImplementation deps.support_test_runner
+    androidTestImplementation deps.support_test_rules
     implementation project(path: ':opentaskspal')
 }
 

opentasks/src/androidTest/java/org/dmfs/tasks/utils/DateTimeToTimeConversionTest.java

@@ -16,7 +16,7 @@
 
 package org.dmfs.tasks.utils;
 
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.runner.AndroidJUnit4;
 import android.text.format.Time;
 
 import org.dmfs.rfc5545.DateTime;

opentasks/src/main/java/com/jmedeisis/draglinearlayout/DragLinearLayout.java

@@ -36,8 +36,8 @@ of this software and associated documentation files (the "Software"), to deal
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
-import android.support.annotation.NonNull;
-import android.support.v4.view.MotionEventCompat;
+import androidx.annotation.NonNull;
+import androidx.core.view.MotionEventCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.SparseArray;

opentasks/src/main/java/org/dmfs/android/widgets/ColoredShapeCheckBox.java

@@ -24,7 +24,7 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
-import android.support.v7.widget.AppCompatCheckBox;
+import androidx.appcompat.widget.AppCompatCheckBox;
 import android.util.AttributeSet;
 
 import org.dmfs.tasks.R;

opentasks/src/main/java/org/dmfs/tasks/AppSettingsFragment.java

@@ -18,7 +18,7 @@
 
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 
 /**

opentasks/src/main/java/org/dmfs/tasks/EditTaskActivity.java

@@ -18,9 +18,9 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.ActionBar;
+import androidx.fragment.app.Fragment;
+import androidx.core.app.NavUtils;
+import androidx.appcompat.app.ActionBar;
 import android.view.Menu;
 import android.view.MenuItem;
 

opentasks/src/main/java/org/dmfs/tasks/EditTaskFragment.java

@@ -25,12 +25,12 @@
 import android.net.Uri;
 import android.os.Build.VERSION;
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
+import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;

opentasks/src/main/java/org/dmfs/tasks/EmptyTaskFragment.java

@@ -18,7 +18,7 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

opentasks/src/main/java/org/dmfs/tasks/InputTextDialogFragment.java

@@ -22,7 +22,7 @@
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnKeyListener;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.ContextThemeWrapper;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;

opentasks/src/main/java/org/dmfs/tasks/JobIds.java

@@ -16,7 +16,7 @@
 
 package org.dmfs.tasks;
 
-import android.support.v4.app.JobIntentService;
+import androidx.core.app.JobIntentService;
 
 
 /**

opentasks/src/main/java/org/dmfs/tasks/ManageListActivity.java

@@ -25,7 +25,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.WindowManager.LayoutParams;

opentasks/src/main/java/org/dmfs/tasks/QuickAddDialogFragment.java

@@ -23,9 +23,9 @@
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.ContextThemeWrapper;

opentasks/src/main/java/org/dmfs/tasks/SettingsListFragment.java

@@ -27,12 +27,12 @@
 import android.database.Cursor;
 import android.os.Bundle;
 import android.os.RemoteException;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
-import android.support.v4.widget.CursorAdapter;
-import android.support.v7.app.AlertDialog;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
+import androidx.cursoradapter.widget.CursorAdapter;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;

opentasks/src/main/java/org/dmfs/tasks/SyncSettingsActivity.java

@@ -16,8 +16,8 @@
 package org.dmfs.tasks;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import android.view.View;
 import android.widget.Button;
 

opentasks/src/main/java/org/dmfs/tasks/TaskGroupPagerAdapter.java

@@ -18,9 +18,9 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import org.dmfs.tasks.groupings.AbstractGroupingFactory;
 import org.dmfs.tasks.groupings.TabConfig;

opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java

@@ -26,20 +26,20 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.MenuItemCompat.OnActionExpandListener;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.SearchView.OnQueryTextListener;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.view.MenuItemCompat;
+import androidx.core.view.MenuItemCompat.OnActionExpandListener;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.SearchView.OnQueryTextListener;
+import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

opentasks/src/main/java/org/dmfs/tasks/TaskListFragment.java

@@ -33,10 +33,10 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.annotation.NonNull;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -59,8 +59,6 @@
 import org.dmfs.tasks.contract.TaskContract;
 import org.dmfs.tasks.contract.TaskContract.Instances;
 import org.dmfs.tasks.contract.TaskContract.Tasks;
-import org.dmfs.tasks.groupings.ByDueDate;
-import org.dmfs.tasks.groupings.ByList;
 import org.dmfs.tasks.groupings.filters.AbstractFilter;
 import org.dmfs.tasks.groupings.filters.ConstantFilter;
 import org.dmfs.tasks.model.Model;

opentasks/src/main/java/org/dmfs/tasks/ViewTaskActivity.java

@@ -22,9 +22,9 @@
 import android.os.Build.VERSION;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.MenuItem;
 import android.view.Window;
 import android.view.WindowManager;