From 5f4753da6fccc69820c034cd0df699679d0cdb2e Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Thu, 13 Apr 2023 23:22:50 -0500 Subject: [PATCH] Gradle plugin 8.0.0 --- app/build.gradle.kts | 1 + .../todoroo/astrid/files/FilesControlSet.kt | 2 +- .../astrid/repeats/RepeatControlSet.kt | 2 +- .../com/todoroo/astrid/tags/TagsControlSet.kt | 2 +- .../todoroo/astrid/timers/TimerControlSet.kt | 2 +- .../todoroo/astrid/ui/ReminderControlSet.kt | 2 +- .../todoroo/astrid/ui/StartDateControlSet.kt | 2 +- .../main/java/org/tasks/auth/Configuration.kt | 4 +-- .../TaskEditControlSetFragmentManager.kt | 10 +++---- .../tasks/repeats/CustomRecurrenceDialog.java | 21 ++++++------- .../java/org/tasks/themes/ThemeAccent.java | 15 +++++----- .../java/org/tasks/ui/CalendarControlSet.kt | 2 +- .../java/org/tasks/ui/LocationControlSet.kt | 2 +- .../java/org/tasks/ui/SubtaskControlSet.kt | 2 +- build.gradle.kts | 2 +- deps_fdroid.txt | 30 +++++++++---------- deps_googleplay.txt | 30 +++++++++---------- 17 files changed, 64 insertions(+), 67 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 883a24a59..e846a120a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -41,6 +41,7 @@ android { viewBinding = true dataBinding = true compose = true + buildConfig = true } lint { diff --git a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt index 4aea1605b..d9630c48b 100644 --- a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt +++ b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.kt @@ -119,7 +119,7 @@ class FilesControlSet : TaskEditControlFragment() { } companion object { - const val TAG = R.string.TEA_ctrl_files_pref + val TAG = R.string.TEA_ctrl_files_pref private const val FRAG_TAG_ADD_ATTACHMENT_DIALOG = "frag_tag_add_attachment_dialog" } } diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt index 3818a28ea..5a55e738c 100644 --- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt +++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.kt @@ -99,7 +99,7 @@ class RepeatControlSet : TaskEditControlFragment() { override fun controlId() = TAG companion object { - const val TAG = R.string.TEA_ctrl_repeat_pref + val TAG = R.string.TEA_ctrl_repeat_pref private const val FRAG_TAG_BASIC_RECURRENCE = "frag_tag_basic_recurrence" private const val REQUEST_RECURRENCE = 10000 } diff --git a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt index b28d6f1db..8bfe6e963 100644 --- a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt +++ b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.kt @@ -57,7 +57,7 @@ class TagsControlSet : TaskEditControlFragment() { } companion object { - const val TAG = R.string.TEA_ctrl_lists_pref + val TAG = R.string.TEA_ctrl_lists_pref private const val REQUEST_TAG_PICKER_ACTIVITY = 10582 } } diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt b/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt index 5cfd4eafc..759fb1187 100644 --- a/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt +++ b/app/src/main/java/com/todoroo/astrid/timers/TimerControlSet.kt @@ -113,6 +113,6 @@ class TimerControlSet : TaskEditControlFragment() { } companion object { - const val TAG = R.string.TEA_ctrl_timer_pref + val TAG = R.string.TEA_ctrl_timer_pref } } diff --git a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt index 6207f6a0a..86e87bcba 100644 --- a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt +++ b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.kt @@ -129,7 +129,7 @@ class ReminderControlSet : TaskEditControlFragment() { override fun controlId() = TAG companion object { - const val TAG = R.string.TEA_ctrl_reminders_pref + val TAG = R.string.TEA_ctrl_reminders_pref private const val EXTRA_REPLACE = "extra_replace" } } diff --git a/app/src/main/java/com/todoroo/astrid/ui/StartDateControlSet.kt b/app/src/main/java/com/todoroo/astrid/ui/StartDateControlSet.kt index 33199c301..aee215d2e 100644 --- a/app/src/main/java/com/todoroo/astrid/ui/StartDateControlSet.kt +++ b/app/src/main/java/com/todoroo/astrid/ui/StartDateControlSet.kt @@ -109,7 +109,7 @@ class StartDateControlSet : TaskEditControlFragment() { } companion object { - const val TAG = R.string.TEA_ctrl_hide_until_pref + val TAG = R.string.TEA_ctrl_hide_until_pref private const val REQUEST_START_DATE = 11011 private const val FRAG_TAG_DATE_PICKER = "frag_tag_date_picker" diff --git a/app/src/main/java/org/tasks/auth/Configuration.kt b/app/src/main/java/org/tasks/auth/Configuration.kt index 79a242f5d..4eed093be 100644 --- a/app/src/main/java/org/tasks/auth/Configuration.kt +++ b/app/src/main/java/org/tasks/auth/Configuration.kt @@ -209,8 +209,8 @@ class Configuration constructor( companion object { private const val PREFS_NAME = "config" private const val KEY_LAST_HASH = "lastHash" - const val GOOGLE_CONFIG = R.raw.google_config - const val GITHUB_CONFIG = R.raw.github_config + val GOOGLE_CONFIG = R.raw.google_config + val GITHUB_CONFIG = R.raw.github_config } init { diff --git a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.kt b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.kt index a63c4f222..5f1cefe45 100644 --- a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.kt +++ b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.kt @@ -41,11 +41,11 @@ class TaskEditControlSetFragmentManager @Inject constructor( } companion object { - const val TAG_DESCRIPTION = R.string.TEA_ctrl_notes_pref - const val TAG_CREATION = R.string.TEA_ctrl_creation_date - const val TAG_LIST = R.string.TEA_ctrl_google_task_list - const val TAG_PRIORITY = R.string.TEA_ctrl_importance_pref - const val TAG_DUE_DATE = R.string.TEA_ctrl_when_pref + val TAG_DESCRIPTION = R.string.TEA_ctrl_notes_pref + val TAG_CREATION = R.string.TEA_ctrl_creation_date + val TAG_LIST = R.string.TEA_ctrl_google_task_list + val TAG_PRIORITY = R.string.TEA_ctrl_importance_pref + val TAG_DUE_DATE = R.string.TEA_ctrl_when_pref private val TASK_EDIT_CONTROL_SET_FRAGMENTS = intArrayOf( TAG_DUE_DATE, diff --git a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java index 6a9276e7f..cbc96fe8c 100644 --- a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java +++ b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java @@ -362,18 +362,15 @@ public class CustomRecurrenceDialog extends DialogFragment { rrule.getDayList().clear(); rrule.getDayList().addAll(checked); } else if (rrule.getFrequency() == MONTHLY) { - switch (monthGroup.getCheckedRadioButtonId()) { - case R.id.repeat_monthly_same_day: - rrule.getDayList().clear(); - break; - case R.id.repeat_monthly_day_of_nth_week: - rrule.getDayList().clear(); - rrule.getDayList().addAll(newArrayList((WeekDay) repeatMonthlyDayOfNthWeek.getTag())); - break; - case R.id.repeat_monthly_day_of_last_week: - rrule.getDayList().clear(); - rrule.getDayList().addAll(newArrayList((WeekDay) repeatMonthlyDayOfLastWeek.getTag())); - break; + int checkedRadioButtonId = monthGroup.getCheckedRadioButtonId(); + if (checkedRadioButtonId == R.id.repeat_monthly_same_day) { + rrule.getDayList().clear(); + } else if (checkedRadioButtonId == R.id.repeat_monthly_day_of_nth_week) { + rrule.getDayList().clear(); + rrule.getDayList().addAll(newArrayList((WeekDay) repeatMonthlyDayOfNthWeek.getTag())); + } else if (checkedRadioButtonId == R.id.repeat_monthly_day_of_last_week) { + rrule.getDayList().clear(); + rrule.getDayList().addAll(newArrayList((WeekDay) repeatMonthlyDayOfLastWeek.getTag())); } } else { rrule.getDayList().clear(); diff --git a/app/src/main/java/org/tasks/themes/ThemeAccent.java b/app/src/main/java/org/tasks/themes/ThemeAccent.java index 52bcf59ea..fe39c035d 100644 --- a/app/src/main/java/org/tasks/themes/ThemeAccent.java +++ b/app/src/main/java/org/tasks/themes/ThemeAccent.java @@ -95,15 +95,14 @@ public class ThemeAccent implements Pickable { @Override public boolean isFree() { - switch (style) { - case R.style.BlueGreyAccent: - case R.style.RedAccent: - case R.style.BlueGreyAccentDesaturated: - case R.style.RedAccentDesaturated: - return true; - default: - return false; + if (style == R.style.BlueGreyAccent || + style == R.style.RedAccent || + style == R.style.BlueGreyAccentDesaturated || + style == R.style.RedAccentDesaturated + ) { + return true; } + return false; } @Deprecated diff --git a/app/src/main/java/org/tasks/ui/CalendarControlSet.kt b/app/src/main/java/org/tasks/ui/CalendarControlSet.kt index b02ef4dea..99b0d6de9 100644 --- a/app/src/main/java/org/tasks/ui/CalendarControlSet.kt +++ b/app/src/main/java/org/tasks/ui/CalendarControlSet.kt @@ -124,6 +124,6 @@ class CalendarControlSet : TaskEditControlFragment() { } companion object { - const val TAG = R.string.TEA_ctrl_gcal + val TAG = R.string.TEA_ctrl_gcal } } diff --git a/app/src/main/java/org/tasks/ui/LocationControlSet.kt b/app/src/main/java/org/tasks/ui/LocationControlSet.kt index 40b8cce3c..8c870bf70 100644 --- a/app/src/main/java/org/tasks/ui/LocationControlSet.kt +++ b/app/src/main/java/org/tasks/ui/LocationControlSet.kt @@ -152,7 +152,7 @@ class LocationControlSet : TaskEditControlFragment() { } companion object { - const val TAG = R.string.TEA_ctrl_locations_pref + val TAG = R.string.TEA_ctrl_locations_pref private const val REQUEST_LOCATION_REMINDER = 12153 private const val REQUEST_GEOFENCE_DETAILS = 12154 private const val REQUEST_LOCATION_PERMISSIONS = 12155 diff --git a/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt b/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt index 4607244d9..4311f5680 100644 --- a/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt +++ b/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt @@ -106,7 +106,7 @@ class SubtaskControlSet : TaskEditControlFragment() { } companion object { - const val TAG = R.string.TEA_ctrl_subtask_pref + val TAG = R.string.TEA_ctrl_subtask_pref private fun getQueryTemplate(task: Task): QueryTemplate = QueryTemplate() .where( Criterion.and( diff --git a/build.gradle.kts b/build.gradle.kts index 0f5250f31..1f8aa0b61 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath("com.android.tools.build:gradle:7.4.2") + classpath("com.android.tools.build:gradle:8.0.0") classpath("com.google.gms:google-services:4.3.15") classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.5") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}") diff --git a/deps_fdroid.txt b/deps_fdroid.txt index b7c8460fd..6fb7294cf 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -1,15 +1,15 @@ -++--- androidx.databinding:viewbinding:7.4.2 +++--- androidx.databinding:viewbinding:8.0.0 +| \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 +| \--- androidx.annotation:annotation-jvm:1.6.0 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 1.8.20 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +| \--- org.jetbrains:annotations:13.0 -> 20.1.0 -++--- androidx.databinding:databinding-common:7.4.2 -++--- androidx.databinding:databinding-runtime:7.4.2 +++--- androidx.databinding:databinding-common:8.0.0 +++--- androidx.databinding:databinding-runtime:8.0.0 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) -+| +--- androidx.databinding:databinding-common:7.4.2 -+| +--- androidx.databinding:viewbinding:7.4.2 (*) ++| +--- androidx.databinding:databinding-common:8.0.0 ++| +--- androidx.databinding:viewbinding:8.0.0 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.6.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) +| +--- androidx.arch.core:core-common:2.2.0 @@ -71,10 +71,10 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c) +| \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c) -++--- androidx.databinding:databinding-adapters:7.4.2 -+| +--- androidx.databinding:databinding-runtime:7.4.2 (*) -+| \--- androidx.databinding:databinding-common:7.4.2 -++--- androidx.databinding:databinding-ktx:7.4.2 +++--- androidx.databinding:databinding-adapters:8.0.0 ++| +--- androidx.databinding:databinding-runtime:8.0.0 (*) ++| \--- androidx.databinding:databinding-common:8.0.0 +++--- androidx.databinding:databinding-ktx:8.0.0 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.4 (*) +| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 -> 2.6.1 +| | +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*) @@ -179,7 +179,7 @@ +| | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c) -+| +--- androidx.databinding:databinding-runtime:7.4.2 (*) ++| +--- androidx.databinding:databinding-runtime:8.0.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.8.20 (*) ++--- com.github.bitfireAT:dav4jvm:2.2.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20 -> 1.8.20 (*) @@ -233,10 +233,10 @@ +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.8.20 (*) +| \--- androidx.core:core:1.9.0 (c) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -> 7.4.2 -+| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.4.2 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.4.2 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.4.2 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 8.0.0 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 8.0.0 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 8.0.0 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 8.0.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.8.20 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 +| | +--- androidx.activity:activity:1.6.0 -> 1.7.0 @@ -916,7 +916,7 @@ ++--- androidx.compose.ui:ui-viewbinding -> 1.4.1 +| +--- androidx.compose.ui:ui:1.4.1 (*) +| +--- androidx.compose.ui:ui-util:1.4.1 (*) -+| +--- androidx.databinding:viewbinding:4.1.2 -> 7.4.2 (*) ++| +--- androidx.databinding:viewbinding:4.1.2 -> 8.0.0 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.5.6 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*) +| +--- androidx.compose.ui:ui:1.4.1 (c) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index 91cd0a54f..37baf7904 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -1,15 +1,15 @@ -++--- androidx.databinding:viewbinding:7.4.2 +++--- androidx.databinding:viewbinding:8.0.0 +| \--- androidx.annotation:annotation:1.0.0 -> 1.6.0 +| \--- androidx.annotation:annotation-jvm:1.6.0 +| \--- org.jetbrains.kotlin:kotlin-stdlib:1.8.0 -> 1.8.20 +| +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +| \--- org.jetbrains:annotations:13.0 -> 20.1.0 -++--- androidx.databinding:databinding-common:7.4.2 -++--- androidx.databinding:databinding-runtime:7.4.2 +++--- androidx.databinding:databinding-common:8.0.0 +++--- androidx.databinding:databinding-runtime:8.0.0 +| +--- androidx.collection:collection:1.0.0 -> 1.2.0 +| | \--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) -+| +--- androidx.databinding:databinding-common:7.4.2 -+| +--- androidx.databinding:viewbinding:7.4.2 (*) ++| +--- androidx.databinding:databinding-common:8.0.0 ++| +--- androidx.databinding:viewbinding:8.0.0 (*) +| \--- androidx.lifecycle:lifecycle-runtime:2.4.0 -> 2.6.1 +| +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*) +| +--- androidx.arch.core:core-common:2.2.0 @@ -72,10 +72,10 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c) +| \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c) -++--- androidx.databinding:databinding-adapters:7.4.2 -+| +--- androidx.databinding:databinding-runtime:7.4.2 (*) -+| \--- androidx.databinding:databinding-common:7.4.2 -++--- androidx.databinding:databinding-ktx:7.4.2 +++--- androidx.databinding:databinding-adapters:8.0.0 ++| +--- androidx.databinding:databinding-runtime:8.0.0 (*) ++| \--- androidx.databinding:databinding-common:8.0.0 +++--- androidx.databinding:databinding-ktx:8.0.0 +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 -> 1.6.4 (*) +| +--- androidx.lifecycle:lifecycle-runtime-ktx:2.4.0 -> 2.6.1 +| | +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*) @@ -180,7 +180,7 @@ +| | +--- androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1 (c) +| | +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1 (c) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.1 (c) -+| +--- androidx.databinding:databinding-runtime:7.4.2 (*) ++| +--- androidx.databinding:databinding-runtime:8.0.0 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 -> 1.8.20 (*) ++--- com.google.firebase:firebase-bom:31.5.0 +| +--- com.google.firebase:firebase-analytics:21.2.2 (c) @@ -503,10 +503,10 @@ +| | \--- org.slf4j:slf4j-api:2.0.3 +| \--- androidx.core:core-ktx:1.9.0 (*) ++--- com.github.bitfireAT:cert4android:7814052 -+| +--- androidx.databinding:databinding-common:7.2.0 -> 7.4.2 -+| +--- androidx.databinding:databinding-runtime:7.2.0 -> 7.4.2 (*) -+| +--- androidx.databinding:databinding-adapters:7.2.0 -> 7.4.2 (*) -+| +--- androidx.databinding:databinding-ktx:7.2.0 -> 7.4.2 (*) ++| +--- androidx.databinding:databinding-common:7.2.0 -> 8.0.0 ++| +--- androidx.databinding:databinding-runtime:7.2.0 -> 8.0.0 (*) ++| +--- androidx.databinding:databinding-adapters:7.2.0 -> 8.0.0 (*) ++| +--- androidx.databinding:databinding-ktx:7.2.0 -> 8.0.0 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -> 1.8.20 (*) +| +--- androidx.appcompat:appcompat:1.4.1 -> 1.6.1 (*) +| +--- androidx.cardview:cardview:1.0.0 @@ -1073,7 +1073,7 @@ ++--- androidx.compose.ui:ui-viewbinding -> 1.4.1 +| +--- androidx.compose.ui:ui:1.4.1 (*) +| +--- androidx.compose.ui:ui-util:1.4.1 (*) -+| +--- androidx.databinding:viewbinding:4.1.2 -> 7.4.2 (*) ++| +--- androidx.databinding:viewbinding:4.1.2 -> 8.0.0 (*) +| +--- androidx.fragment:fragment-ktx:1.3.2 -> 1.5.6 (*) +| +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -> 1.8.20 (*) +| +--- androidx.compose.ui:ui:1.4.1 (c)