gradle version upgrade

androidPluto · Feb 9, 2025 · cb93312 · cb93312
1 parent c3f6fb3
commit cb93312
Show file tree

Hide file tree

Showing 66 changed files with 357 additions and 231 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,23 +4,23 @@ java = "1.8"
 
 minSdk = "21"
 targetSdk = "32"
-compileSdk = "33"
-buildTools = "32.0.0"
+compileSdk = "34"
+buildTools = "34.0.0"
 
-agp = "7.4.2"
+agp = "8.2.2"
 androidXCore = "1.6.0"
-androidXLifecycle = "2.4.0"
-compose = "1.4.0"
-composeCompiler = "1.4.7"
-composeMaterial3 = "1.1.2"
+androidXLifecycle = "2.8.7"
+compose = "1.7.7"
+composeCompiler = "1.5.10"
+composeMaterial3 = "1.3.1"
 detekt = "1.19.0"
-kotlin = "1.8.21"
+kotlin = "1.9.22"
 ktlint-plugin = "11.1.0"
 ktor = "2.3.2"
-ksp = "1.8.21-1.0.11"
-moshi = "1.13.0"
-navigation = "2.4.1"
-okhttp = "4.9.1"
+ksp = "1.9.22-1.0.16"
+moshi = "1.15.1"
+navigation = "2.8.6"
+okhttp = "4.12.0"
 retrofit = "2.9.0"
 room = "2.5.1"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Feb 08 21:06:21 IST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/selector/ui/DataSelectorDialog.kt b/pluto-plugins/base/lib/src/main/java/com/pluto/utilities/selector/ui/DataSelectorDialog.kt
@@ -36,7 +36,7 @@ class DataSelectorDialog : BottomSheetDialogFragment() {
         super.onViewCreated(view, savedInstanceState)
         dialog?.setOnShowListener {
             val dialog = it as BottomSheetDialog
-            val bottomSheet = dialog.findViewById<View>(R.id.design_bottom_sheet)
+            val bottomSheet = dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
             bottomSheet?.let {
                 dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx
                 dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED

diff --git a/.../base/lib/src/main/java/com/pluto/utilities/views/keyvalue/edit/KeyValuePairEditDialog.kt b/.../base/lib/src/main/java/com/pluto/utilities/views/keyvalue/edit/KeyValuePairEditDialog.kt
@@ -38,7 +38,7 @@ class KeyValuePairEditDialog : BottomSheetDialogFragment() {
         super.onViewCreated(view, savedInstanceState)
         dialog?.setOnShowListener {
             val dialog = it as BottomSheetDialog
-            val bottomSheet = dialog.findViewById<View>(R.id.design_bottom_sheet)
+            val bottomSheet = dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
             bottomSheet?.let {
                 dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx
                 dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED

diff --git a/.../lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt b/.../lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt
@@ -85,9 +85,9 @@ internal fun PrefListItem(
                 modifier = Modifier
                     .padding(horizontal = 16.dp)
                     .weight(1f),
-                color = colorResource(id = R.color.pluto___text_dark_40),
+                color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_40),
                 style = TextStyle(
-                    fontFamily = FontFamily(Font(R.font.muli)),
+                    fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli)),
                     fontSize = 12.sp
                 )
             )
@@ -96,13 +96,13 @@ internal fun PrefListItem(
                 modifier = Modifier
                     .padding(horizontal = 16.dp)
                     .background(
-                        color = colorResource(id = R.color.pluto___dull_green_08),
+                        color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green_08),
                         shape = RoundedCornerShape(10.dp)
                     )
                     .padding(bottom = 2.dp, start = 8.dp, end = 8.dp),
-                color = colorResource(id = R.color.pluto___dull_green),
+                color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green),
                 style = TextStyle(
-                    fontFamily = FontFamily(Font(R.font.muli_semibold)),
+                    fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)),
                     fontSize = 10.sp
                 )
             )
@@ -115,7 +115,7 @@ internal fun PrefListItem(
             editableItem = editableItem,
             onFocus = onFocus
         )
-        Divider(Modifier.padding(top = 8.dp), color = colorResource(id = R.color.pluto___dark_05))
+        Divider(Modifier.padding(top = 8.dp), color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05))
     }
 }
 
@@ -145,7 +145,7 @@ private fun Element(
                 .fillMaxWidth()
                 .padding(start = 16.dp, end = 24.dp),
             style = TextStyle(
-                fontFamily = FontFamily(Font(R.font.muli))
+                fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli))
             )
         )
     }
@@ -190,11 +190,11 @@ private fun EditableField(
                 newValue.value = input
             },
             colors = OutlinedTextFieldDefaults.colors(
-                focusedBorderColor = colorResource(id = R.color.pluto___text_dark_60),
-                unfocusedBorderColor = colorResource(id = R.color.pluto___text_dark_20)
+                focusedBorderColor = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_60),
+                unfocusedBorderColor = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_20)
             ),
             keyboardOptions = KeyboardOptions.Default.copy(
-                autoCorrect = false,
+//                autoCorrect = false,
                 keyboardType = when (element.type) {
                     Type.TypeString, Type.TypeBoolean -> KeyboardType.Text
                     Type.TypeLong, Type.TypeFloat -> KeyboardType.Number
@@ -252,7 +252,7 @@ private fun ElementCta(
                 .padding(top = 4.dp, bottom = 10.dp),
             painter = painterResource(id = R.drawable.pluto_dts___ic_check),
             contentDescription = "save",
-            colorFilter = ColorFilter.tint(color = colorResource(id = R.color.pluto___dull_green))
+            colorFilter = ColorFilter.tint(color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green))
         )
     }
 }
@@ -269,7 +269,7 @@ private fun PreviewListItem() {
                     "value of the key",
                     Type.TypeString
                 ),
-                modifier = Modifier.background(colorResource(id = R.color.pluto___white))
+                modifier = Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___white))
             )
         }
     }
@@ -287,7 +287,7 @@ private fun PreviewLongContentListItem() {
                     "VERY VERY VERY VERY VERY very very very very Loooong value",
                     Type.TypeBoolean
                 ),
-                modifier = Modifier.background(colorResource(id = R.color.pluto___white))
+                modifier = Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___white))
             )
         }
     }

diff --git a/...tastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/FilterView.kt b/...tastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/FilterView.kt
@@ -91,8 +91,8 @@ private fun FilterItem(
         Column(
             Modifier
                 .borderBackground(
-                    bgColor = colorResource(id = R.color.pluto___white),
-                    borderColor = colorResource(id = R.color.pluto___white),
+                    bgColor = colorResource(id = com.pluto.plugin.R.color.pluto___white),
+                    borderColor = colorResource(id = com.pluto.plugin.R.color.pluto___white),
                     shape = RoundedCornerShape(4.dp)
                 )
                 .padding(bottom = 4.dp)
@@ -101,17 +101,17 @@ private fun FilterItem(
                 Modifier
                     .fillMaxWidth(ColumnWidthPercentage)
                     .borderBackground(
-                        bgColor = colorResource(id = R.color.pluto___section_color),
-                        borderColor = colorResource(id = R.color.pluto___section_color),
+                        bgColor = colorResource(id = com.pluto.plugin.R.color.pluto___section_color),
+                        borderColor = colorResource(id = com.pluto.plugin.R.color.pluto___section_color),
                         shape = RoundedCornerShape(topStart = 4.dp, topEnd = 4.dp)
                     )
                     .padding(vertical = 12.dp, horizontal = 16.dp)
             ) {
                 Text(
                     text = "Preferences",
-                    color = colorResource(id = R.color.pluto___text_dark_80),
+                    color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80),
                     style = TextStyle(
-                        fontFamily = FontFamily(Font(R.font.muli)),
+                        fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli)),
                         fontSize = 15.sp
                     )
                 )
@@ -130,7 +130,7 @@ private fun FilterItem(
                         .fillMaxWidth(ColumnWidthPercentage)
                 ) {
                     if (index != 0) {
-                        Divider(color = colorResource(id = R.color.pluto___dark_05))
+                        Divider(color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05))
                     }
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
@@ -147,15 +147,15 @@ private fun FilterItem(
                                 }
                             },
                             colors = CheckboxDefaults.colors(
-                                checkedColor = colorResource(id = R.color.pluto___blue),
-                                uncheckedColor = colorResource(id = R.color.pluto___dark_40)
+                                checkedColor = colorResource(id = com.pluto.plugin.R.color.pluto___blue),
+                                uncheckedColor = colorResource(id = com.pluto.plugin.R.color.pluto___dark_40)
                             )
                         )
                         Text(
                             text = entry.key,
-                            color = colorResource(id = R.color.pluto___text_dark_80),
+                            color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80),
                             style = TextStyle(
-                                fontFamily = FontFamily(Font(R.font.muli_semibold)),
+                                fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)),
                                 fontSize = 15.sp
                             )
                         )
@@ -195,7 +195,7 @@ private fun FilterBackground(
             Modifier
                 .fillMaxWidth()
                 .fillMaxHeight()
-                .background(colorResource(id = R.color.pluto___dark_80))
+                .background(colorResource(id = com.pluto.plugin.R.color.pluto___dark_80))
                 .clickable {
                     showFilterState.update {
                         false

diff --git a/...ore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/MainComposable.kt b/...ore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/MainComposable.kt
@@ -43,15 +43,15 @@ internal fun MainComposable(
     val scope = rememberCoroutineScope()
     Column(
         Modifier
-            .background(colorResource(id = R.color.pluto___white))
+            .background(colorResource(id = com.pluto.plugin.R.color.pluto___white))
             .padding(
                 top = with(LocalDensity.current) {
                     insets.value.top.toDp()
                 }
             )
     ) {
         ToolBar(onExit = onExit, onFilterClick = onFilterClick)
-        Divider(color = colorResource(id = R.color.pluto___dark_05))
+        Divider(color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05))
         val density = LocalDensity.current
         LazyColumn(
             modifier = Modifier

diff --git a/...astore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/PrefListKtx.kt b/...astore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/PrefListKtx.kt
@@ -51,7 +51,7 @@ internal fun LazyListScope.dataStorePrefItems(
                     data.isExpanded.value = !data.isExpanded.value
                 }
                 .animateItemPlacement()
-                .background(colorResource(id = R.color.pluto___section_color))
+                .background(colorResource(id = com.pluto.plugin.R.color.pluto___section_color))
         ) {
             Row(
                 horizontalArrangement = Arrangement.SpaceBetween,
@@ -66,10 +66,10 @@ internal fun LazyListScope.dataStorePrefItems(
                     modifier = Modifier.padding(
                         vertical = 8.dp
                     ),
-                    color = colorResource(id = R.color.pluto___text_dark_80),
+                    color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80),
                     letterSpacing = 1.2.sp,
                     style = TextStyle(
-                        fontFamily = FontFamily(Font(R.font.muli_semibold)),
+                        fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)),
                         fontSize = 16.sp
                     )
                 )
@@ -89,7 +89,7 @@ internal fun LazyListScope.dataStorePrefItems(
                         }
                 )
             }
-            Divider(Modifier.padding(top = 4.dp), color = colorResource(id = R.color.pluto___dark_05))
+            Divider(Modifier.padding(top = 4.dp), color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05))
         }
     }
     if (data.isExpanded.value) {
@@ -117,7 +117,7 @@ private fun DataStorePrefItemPreview() {
     LazyColumn(
         modifier = Modifier
             .wrapContentHeight(Alignment.Top)
-            .background(colorResource(id = R.color.pluto___white))
+            .background(colorResource(id = com.pluto.plugin.R.color.pluto___white))
     ) {
         dataStorePrefItems(
             PrefUiModel(

diff --git a/.../datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/Toolbar.kt b/.../datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/Toolbar.kt
@@ -31,7 +31,7 @@ fun ToolBar(
     Row(
         modifier = modifier
             .fillMaxWidth()
-            .background(colorResource(id = R.color.pluto___dark)),
+            .background(colorResource(id = com.pluto.plugin.R.color.pluto___dark)),
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
         ConstraintLayout(
@@ -52,7 +52,7 @@ fun ToolBar(
             )
             Text(
                 stringResource(id = R.string.pluto_dts___plugin_name),
-                color = colorResource(id = R.color.pluto___white),
+                color = colorResource(id = com.pluto.plugin.R.color.pluto___white),
                 modifier = Modifier
                     .constrainAs(title) {
                         top.linkTo(parent.top)
@@ -61,7 +61,7 @@ fun ToolBar(
                     }
                     .padding(vertical = 16.dp),
                 style = TextStyle(
-                    fontFamily = FontFamily(Font(R.font.muli_semibold)),
+                    fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)),
                     fontSize = 16.sp
                 )
             )
@@ -84,5 +84,5 @@ fun ToolBar(
 @Composable
 @Preview
 private fun PreviewToolbar() {
-    ToolBar(Modifier.background(colorResource(id = R.color.pluto___dark)), {}, {})
+    ToolBar(Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___dark)), {}, {})
 }
diff --git a/...s/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/DataModel.kt b/...s/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/DataModel.kt
@@ -153,9 +153,9 @@ internal fun getStateStringSpan(context: Context, state: String): CharSequence {
                     state.uppercase(),
                     context.color(
                         when (state) {
-                            Thread.State.BLOCKED.name -> R.color.pluto___red_dark
-                            Thread.State.WAITING.name -> R.color.pluto___orange
-                            else -> R.color.pluto___text_dark_80
+                            Thread.State.BLOCKED.name -> com.pluto.plugin.R.color.pluto___red_dark
+                            Thread.State.WAITING.name -> com.pluto.plugin.R.color.pluto___orange
+                            else -> com.pluto.plugin.R.color.pluto___text_dark_80
                         }
                     )
                 )

diff --git a/...main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsHeaderHolder.kt b/...main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsHeaderHolder.kt
@@ -36,7 +36,7 @@ internal class CrashItemDetailsHeaderHolder(
                     append("\n\t\t\t")
                     append(
                         fontColor(
-                            " at  ", context.color(R.color.pluto___text_dark_40)
+                            " at  ", context.color(com.pluto.plugin.R.color.pluto___text_dark_40)
                         )
                     )
                     append(it)
@@ -45,7 +45,7 @@ internal class CrashItemDetailsHeaderHolder(
                 if (extraTrace > 0) {
                     append(
                         fontColor(
-                            "\n\t\t\t + $extraTrace more lines", context.color(R.color.pluto___text_dark_40)
+                            "\n\t\t\t + $extraTrace more lines", context.color(com.pluto.plugin.R.color.pluto___text_dark_40)
                         )
                     )
                 }
@@ -72,7 +72,7 @@ internal class CrashItemDetailsHeaderHolder(
                     append(
                         fontColor(
                             getString(R.string.pluto_excep___anr_list_title),
-                            color(R.color.pluto___text_dark_80)
+                            color(com.pluto.plugin.R.color.pluto___text_dark_80)
                         )
                     )
                 }
@@ -81,13 +81,13 @@ internal class CrashItemDetailsHeaderHolder(
             title.setSpan {
                 append("${item.file}\t\t")
                 append(
-                    fontColor("line: ${item.lineNumber}", context.color(R.color.pluto___text_dark_80))
+                    fontColor("line: ${item.lineNumber}", context.color(com.pluto.plugin.R.color.pluto___text_dark_80))
                 )
             }
             message.setSpan {
                 append("${item.name}\n")
                 append(
-                    fontColor("${item.message}", context.color(R.color.pluto___text_dark_60))
+                    fontColor("${item.message}", context.color(com.pluto.plugin.R.color.pluto___text_dark_60))
                 )
             }
         }

diff --git a/...main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadHolder.kt b/...main/java/com/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadHolder.kt
@@ -33,10 +33,10 @@ internal class CrashItemDetailsThreadHolder(
                     key = context.getString(R.string.pluto_excep___thread_name_label),
                     value = context.createSpan {
                         append(semiBold("${item.name.uppercase()}\t"))
-                        append(fontColor("(", context.color(R.color.pluto___text_dark_60)))
-                        append(fontColor("id: ", context.color(R.color.pluto___text_dark_60)))
-                        append(bold(fontColor("${item.id}", context.color(R.color.pluto___text_dark_60))))
-                        append(fontColor(")", context.color(R.color.pluto___text_dark_60)))
+                        append(fontColor("(", context.color(com.pluto.plugin.R.color.pluto___text_dark_60)))
+                        append(fontColor("id: ", context.color(com.pluto.plugin.R.color.pluto___text_dark_60)))
+                        append(bold(fontColor("${item.id}", context.color(com.pluto.plugin.R.color.pluto___text_dark_60))))
+                        append(fontColor(")", context.color(com.pluto.plugin.R.color.pluto___text_dark_60)))
                     }
                 )
             )

diff --git a/...om/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadStackThreadHolder.kt b/...om/pluto/plugins/exceptions/internal/ui/holder/CrashItemDetailsThreadStackThreadHolder.kt
@@ -23,7 +23,7 @@ internal class CrashItemDetailsThreadStackThreadHolder(
         if (item is ThreadStates) {
             binding.label.setSpan {
                 append(context.getString(R.string.pluto_excep___thread_stack_traces_label))
-                append(fontColor(" (${item.states.size})", context.color(R.color.pluto___text_dark_40)))
+                append(fontColor(" (${item.states.size})", context.color(com.pluto.plugin.R.color.pluto___text_dark_40)))
             }
             binding.root.setOnDebounceClickListener {
                 onAction("thread_stack_trace")