target sdk 29, move to androidx

diff --git a/gradle.properties b/gradle.properties
index aac7c9b4614ccfde6c721f24994cf30885a791d0..9e6fce102d11ffba5aae545fe7b688386407e699 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 230378abfcb61bc598ad4e60f3811a3028fd2a8c..fa3f8a61c3f50c079447d80cc75863673778f5c5 100644 (file)
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -11,14 +11,14 @@ def makeGitDescription = {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.acmetensortoys.ctfwstimer"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 15
         versionName "1.4.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         vectorDrawables.useSupportLibrary = true
     }
@@ -59,15 +59,17 @@ repositories {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
     api project(":lib")
 
-    api 'com.android.support:appcompat-v7:28.0.0'
-    api 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:support-annotations:28.0.0'
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     // Nah.
     // wearApp project(':wear')
@@ -80,6 +82,4 @@ dependencies {
     }
 
     testImplementation 'junit:junit:4.12'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 }

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
index 71188a3c392cfee7f676745627e327510f5911bd..45cfe86a7fa67d93745ea0c0e1a0e736b9e9760e 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
@@ -4,7 +4,7 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/CtFwSActivityBase.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/CtFwSActivityBase.java
index 97b56648bfbf4875a79133db9bcd1c392caa590e..bdec712e774ed3a413751b8f6556e04754c7ed2e 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/CtFwSActivityBase.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/CtFwSActivityBase.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.acmetensortoys.ctfwstimer.service.MainService;
 

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
index b84a61684c60ea6d71f43431d00cbffc6e465e07..8ffe98992c4b23fb9777bd297989942cd2a805bd 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/HandbookActivity.java
@@ -1,6 +1,6 @@
 package com.acmetensortoys.ctfwstimer.activity;
 
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
index b56c9cc56630ae467f850c43bb8a972a2d2f498f..60caa6c0f5f29dd57df05813e62e15c995a75c71 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
@@ -4,8 +4,9 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.preference.PreferenceManager;
-import android.support.annotation.StringRes;
+import androidx.annotation.StringRes;
 import android.os.Bundle;
+import androidx.appcompat.view.menu.MenuBuilder;
 import android.text.Spanned;
 import android.util.Log;
 import android.view.Menu;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
index 7cedc233b9698fe42cfa98d75a21cfca2085a494..2ecc35f16e14f8d2b27f882bfdfd5ace9383fb1a 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainService.java
@@ -8,8 +8,8 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Consumer;
+import androidx.annotation.Nullable;
+import androidx.core.util.Consumer;
 import android.util.Log;
 
 import com.acmetensortoys.ctfwstimer.lib.CtFwSGameStateManager;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
index 8c1ed21e9913bcede8a068ccb11329c318099311..2c7c3ceedf43b71d092b764b7e07e743aa5ea879 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
@@ -14,7 +14,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 
 import com.acmetensortoys.ctfwstimer.activity.MainActivity;

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java
index 22772ba335dcfb3b1cd8d7704ab40456575047e2..a69ccec8eacbd2b892d12351137c6409455fb810 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/utils/HandbookDownloader.java
@@ -2,7 +2,7 @@ package com.acmetensortoys.ctfwstimer.utils;
 
 import android.content.Context;
 import android.os.Handler;
-import android.support.v4.util.Consumer;
+import androidx.core.util.Consumer;
 import android.util.Log;
 
 import com.acmetensortoys.ctfwstimer.activity.HandbookActivity;