From f75c170ebbe91a877157e01e7de1a8bafb1bbb92 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Wed, 2 Oct 2019 01:34:58 +0100 Subject: [PATCH] target sdk 29, move to androidx --- gradle.properties | 2 ++ mobile/build.gradle | 18 +++++++++--------- .../ctfwstimer/activity/AboutActivity.java | 2 +- .../ctfwstimer/activity/CtFwSActivityBase.java | 2 +- .../ctfwstimer/activity/HandbookActivity.java | 2 +- .../ctfwstimer/activity/MainActivity.java | 3 ++- .../ctfwstimer/service/MainService.java | 4 ++-- .../service/MainServiceNotification.java | 2 +- .../ctfwstimer/utils/HandbookDownloader.java | 2 +- 9 files changed, 20 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- 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 230378a..fa3f8a6 100644 --- 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 71188a3..45cfe86 100644 --- 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 97b5664..bdec712 100644 --- 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 b84a616..8ffe989 100644 --- 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 b56c9cc..60caa6c 100644 --- 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 7cedc23..2ecc35f 100644 --- 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 8c1ed21..2c7c3ce 100644 --- 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 22772ba..a69ccec 100644 --- 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; -- 2.50.1