Skip to content

Commit cb93312

Browse files
srtvprateeksrtvprateek
committed
gradle version upgrade
1 parent c3f6fb3 commit cb93312

File tree

66 files changed

+357
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+357
-231
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ java = "1.8"
44

55
minSdk = "21"
66
targetSdk = "32"
7-
compileSdk = "33"
8-
buildTools = "32.0.0"
7+
compileSdk = "34"
8+
buildTools = "34.0.0"
99

10-
agp = "7.4.2"
10+
agp = "8.2.2"
1111
androidXCore = "1.6.0"
12-
androidXLifecycle = "2.4.0"
13-
compose = "1.4.0"
14-
composeCompiler = "1.4.7"
15-
composeMaterial3 = "1.1.2"
12+
androidXLifecycle = "2.8.7"
13+
compose = "1.7.7"
14+
composeCompiler = "1.5.10"
15+
composeMaterial3 = "1.3.1"
1616
detekt = "1.19.0"
17-
kotlin = "1.8.21"
17+
kotlin = "1.9.22"
1818
ktlint-plugin = "11.1.0"
1919
ktor = "2.3.2"
20-
ksp = "1.8.21-1.0.11"
21-
moshi = "1.13.0"
22-
navigation = "2.4.1"
23-
okhttp = "4.9.1"
20+
ksp = "1.9.22-1.0.16"
21+
moshi = "1.15.1"
22+
navigation = "2.8.6"
23+
okhttp = "4.12.0"
2424
retrofit = "2.9.0"
2525
room = "2.5.1"
2626

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Feb 08 21:06:21 IST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

‎pluto-plugins/base/lib/src/main/java/com/pluto/utilities/selector/ui/DataSelectorDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class DataSelectorDialog : BottomSheetDialogFragment() {
3636
super.onViewCreated(view, savedInstanceState)
3737
dialog?.setOnShowListener {
3838
val dialog = it as BottomSheetDialog
39-
val bottomSheet = dialog.findViewById<View>(R.id.design_bottom_sheet)
39+
val bottomSheet = dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
4040
bottomSheet?.let {
4141
dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx
4242
dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED

‎pluto-plugins/base/lib/src/main/java/com/pluto/utilities/views/keyvalue/edit/KeyValuePairEditDialog.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class KeyValuePairEditDialog : BottomSheetDialogFragment() {
3838
super.onViewCreated(view, savedInstanceState)
3939
dialog?.setOnShowListener {
4040
val dialog = it as BottomSheetDialog
41-
val bottomSheet = dialog.findViewById<View>(R.id.design_bottom_sheet)
41+
val bottomSheet = dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)
4242
bottomSheet?.let {
4343
dialog.behavior.peekHeight = Device(requireContext()).screen.heightPx
4444
dialog.behavior.state = BottomSheetBehavior.STATE_EXPANDED

‎pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/DisplayComponents.kt‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ internal fun PrefListItem(
8585
modifier = Modifier
8686
.padding(horizontal = 16.dp)
8787
.weight(1f),
88-
color = colorResource(id = R.color.pluto___text_dark_40),
88+
color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_40),
8989
style = TextStyle(
90-
fontFamily = FontFamily(Font(R.font.muli)),
90+
fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli)),
9191
fontSize = 12.sp
9292
)
9393
)
@@ -96,13 +96,13 @@ internal fun PrefListItem(
9696
modifier = Modifier
9797
.padding(horizontal = 16.dp)
9898
.background(
99-
color = colorResource(id = R.color.pluto___dull_green_08),
99+
color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green_08),
100100
shape = RoundedCornerShape(10.dp)
101101
)
102102
.padding(bottom = 2.dp, start = 8.dp, end = 8.dp),
103-
color = colorResource(id = R.color.pluto___dull_green),
103+
color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green),
104104
style = TextStyle(
105-
fontFamily = FontFamily(Font(R.font.muli_semibold)),
105+
fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)),
106106
fontSize = 10.sp
107107
)
108108
)
@@ -115,7 +115,7 @@ internal fun PrefListItem(
115115
editableItem = editableItem,
116116
onFocus = onFocus
117117
)
118-
Divider(Modifier.padding(top = 8.dp), color = colorResource(id = R.color.pluto___dark_05))
118+
Divider(Modifier.padding(top = 8.dp), color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05))
119119
}
120120
}
121121

@@ -145,7 +145,7 @@ private fun Element(
145145
.fillMaxWidth()
146146
.padding(start = 16.dp, end = 24.dp),
147147
style = TextStyle(
148-
fontFamily = FontFamily(Font(R.font.muli))
148+
fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli))
149149
)
150150
)
151151
}
@@ -190,11 +190,11 @@ private fun EditableField(
190190
newValue.value = input
191191
},
192192
colors = OutlinedTextFieldDefaults.colors(
193-
focusedBorderColor = colorResource(id = R.color.pluto___text_dark_60),
194-
unfocusedBorderColor = colorResource(id = R.color.pluto___text_dark_20)
193+
focusedBorderColor = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_60),
194+
unfocusedBorderColor = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_20)
195195
),
196196
keyboardOptions = KeyboardOptions.Default.copy(
197-
autoCorrect = false,
197+
// autoCorrect = false,
198198
keyboardType = when (element.type) {
199199
Type.TypeString, Type.TypeBoolean -> KeyboardType.Text
200200
Type.TypeLong, Type.TypeFloat -> KeyboardType.Number
@@ -252,7 +252,7 @@ private fun ElementCta(
252252
.padding(top = 4.dp, bottom = 10.dp),
253253
painter = painterResource(id = R.drawable.pluto_dts___ic_check),
254254
contentDescription = "save",
255-
colorFilter = ColorFilter.tint(color = colorResource(id = R.color.pluto___dull_green))
255+
colorFilter = ColorFilter.tint(color = colorResource(id = com.pluto.plugin.R.color.pluto___dull_green))
256256
)
257257
}
258258
}
@@ -269,7 +269,7 @@ private fun PreviewListItem() {
269269
"value of the key",
270270
Type.TypeString
271271
),
272-
modifier = Modifier.background(colorResource(id = R.color.pluto___white))
272+
modifier = Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___white))
273273
)
274274
}
275275
}
@@ -287,7 +287,7 @@ private fun PreviewLongContentListItem() {
287287
"VERY VERY VERY VERY VERY very very very very Loooong value",
288288
Type.TypeBoolean
289289
),
290-
modifier = Modifier.background(colorResource(id = R.color.pluto___white))
290+
modifier = Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___white))
291291
)
292292
}
293293
}

‎pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/FilterView.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ private fun FilterItem(
9191
Column(
9292
Modifier
9393
.borderBackground(
94-
bgColor = colorResource(id = R.color.pluto___white),
95-
borderColor = colorResource(id = R.color.pluto___white),
94+
bgColor = colorResource(id = com.pluto.plugin.R.color.pluto___white),
95+
borderColor = colorResource(id = com.pluto.plugin.R.color.pluto___white),
9696
shape = RoundedCornerShape(4.dp)
9797
)
9898
.padding(bottom = 4.dp)
@@ -101,17 +101,17 @@ private fun FilterItem(
101101
Modifier
102102
.fillMaxWidth(ColumnWidthPercentage)
103103
.borderBackground(
104-
bgColor = colorResource(id = R.color.pluto___section_color),
105-
borderColor = colorResource(id = R.color.pluto___section_color),
104+
bgColor = colorResource(id = com.pluto.plugin.R.color.pluto___section_color),
105+
borderColor = colorResource(id = com.pluto.plugin.R.color.pluto___section_color),
106106
shape = RoundedCornerShape(topStart = 4.dp, topEnd = 4.dp)
107107
)
108108
.padding(vertical = 12.dp, horizontal = 16.dp)
109109
) {
110110
Text(
111111
text = "Preferences",
112-
color = colorResource(id = R.color.pluto___text_dark_80),
112+
color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80),
113113
style = TextStyle(
114-
fontFamily = FontFamily(Font(R.font.muli)),
114+
fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli)),
115115
fontSize = 15.sp
116116
)
117117
)
@@ -130,7 +130,7 @@ private fun FilterItem(
130130
.fillMaxWidth(ColumnWidthPercentage)
131131
) {
132132
if (index != 0) {
133-
Divider(color = colorResource(id = R.color.pluto___dark_05))
133+
Divider(color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05))
134134
}
135135
Row(
136136
verticalAlignment = Alignment.CenterVertically,
@@ -147,15 +147,15 @@ private fun FilterItem(
147147
}
148148
},
149149
colors = CheckboxDefaults.colors(
150-
checkedColor = colorResource(id = R.color.pluto___blue),
151-
uncheckedColor = colorResource(id = R.color.pluto___dark_40)
150+
checkedColor = colorResource(id = com.pluto.plugin.R.color.pluto___blue),
151+
uncheckedColor = colorResource(id = com.pluto.plugin.R.color.pluto___dark_40)
152152
)
153153
)
154154
Text(
155155
text = entry.key,
156-
color = colorResource(id = R.color.pluto___text_dark_80),
156+
color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80),
157157
style = TextStyle(
158-
fontFamily = FontFamily(Font(R.font.muli_semibold)),
158+
fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)),
159159
fontSize = 15.sp
160160
)
161161
)
@@ -195,7 +195,7 @@ private fun FilterBackground(
195195
Modifier
196196
.fillMaxWidth()
197197
.fillMaxHeight()
198-
.background(colorResource(id = R.color.pluto___dark_80))
198+
.background(colorResource(id = com.pluto.plugin.R.color.pluto___dark_80))
199199
.clickable {
200200
showFilterState.update {
201201
false

‎pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/MainComposable.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ internal fun MainComposable(
4343
val scope = rememberCoroutineScope()
4444
Column(
4545
Modifier
46-
.background(colorResource(id = R.color.pluto___white))
46+
.background(colorResource(id = com.pluto.plugin.R.color.pluto___white))
4747
.padding(
4848
top = with(LocalDensity.current) {
4949
insets.value.top.toDp()
5050
}
5151
)
5252
) {
5353
ToolBar(onExit = onExit, onFilterClick = onFilterClick)
54-
Divider(color = colorResource(id = R.color.pluto___dark_05))
54+
Divider(color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05))
5555
val density = LocalDensity.current
5656
LazyColumn(
5757
modifier = Modifier

‎pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/PrefListKtx.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ internal fun LazyListScope.dataStorePrefItems(
5151
data.isExpanded.value = !data.isExpanded.value
5252
}
5353
.animateItemPlacement()
54-
.background(colorResource(id = R.color.pluto___section_color))
54+
.background(colorResource(id = com.pluto.plugin.R.color.pluto___section_color))
5555
) {
5656
Row(
5757
horizontalArrangement = Arrangement.SpaceBetween,
@@ -66,10 +66,10 @@ internal fun LazyListScope.dataStorePrefItems(
6666
modifier = Modifier.padding(
6767
vertical = 8.dp
6868
),
69-
color = colorResource(id = R.color.pluto___text_dark_80),
69+
color = colorResource(id = com.pluto.plugin.R.color.pluto___text_dark_80),
7070
letterSpacing = 1.2.sp,
7171
style = TextStyle(
72-
fontFamily = FontFamily(Font(R.font.muli_semibold)),
72+
fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)),
7373
fontSize = 16.sp
7474
)
7575
)
@@ -89,7 +89,7 @@ internal fun LazyListScope.dataStorePrefItems(
8989
}
9090
)
9191
}
92-
Divider(Modifier.padding(top = 4.dp), color = colorResource(id = R.color.pluto___dark_05))
92+
Divider(Modifier.padding(top = 4.dp), color = colorResource(id = com.pluto.plugin.R.color.pluto___dark_05))
9393
}
9494
}
9595
if (data.isExpanded.value) {
@@ -117,7 +117,7 @@ private fun DataStorePrefItemPreview() {
117117
LazyColumn(
118118
modifier = Modifier
119119
.wrapContentHeight(Alignment.Top)
120-
.background(colorResource(id = R.color.pluto___white))
120+
.background(colorResource(id = com.pluto.plugin.R.color.pluto___white))
121121
) {
122122
dataStorePrefItems(
123123
PrefUiModel(

‎pluto-plugins/plugins/datastore/lib/src/main/java/com/pluto/plugins/datastore/pref/internal/compose/Toolbar.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fun ToolBar(
3131
Row(
3232
modifier = modifier
3333
.fillMaxWidth()
34-
.background(colorResource(id = R.color.pluto___dark)),
34+
.background(colorResource(id = com.pluto.plugin.R.color.pluto___dark)),
3535
horizontalArrangement = Arrangement.SpaceBetween
3636
) {
3737
ConstraintLayout(
@@ -52,7 +52,7 @@ fun ToolBar(
5252
)
5353
Text(
5454
stringResource(id = R.string.pluto_dts___plugin_name),
55-
color = colorResource(id = R.color.pluto___white),
55+
color = colorResource(id = com.pluto.plugin.R.color.pluto___white),
5656
modifier = Modifier
5757
.constrainAs(title) {
5858
top.linkTo(parent.top)
@@ -61,7 +61,7 @@ fun ToolBar(
6161
}
6262
.padding(vertical = 16.dp),
6363
style = TextStyle(
64-
fontFamily = FontFamily(Font(R.font.muli_semibold)),
64+
fontFamily = FontFamily(Font(com.pluto.plugin.R.font.muli_semibold)),
6565
fontSize = 16.sp
6666
)
6767
)
@@ -84,5 +84,5 @@ fun ToolBar(
8484
@Composable
8585
@Preview
8686
private fun PreviewToolbar() {
87-
ToolBar(Modifier.background(colorResource(id = R.color.pluto___dark)), {}, {})
87+
ToolBar(Modifier.background(colorResource(id = com.pluto.plugin.R.color.pluto___dark)), {}, {})
8888
}

‎pluto-plugins/plugins/exceptions/lib/src/main/java/com/pluto/plugins/exceptions/internal/DataModel.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ internal fun getStateStringSpan(context: Context, state: String): CharSequence {
153153
state.uppercase(),
154154
context.color(
155155
when (state) {
156-
Thread.State.BLOCKED.name -> R.color.pluto___red_dark
157-
Thread.State.WAITING.name -> R.color.pluto___orange
158-
else -> R.color.pluto___text_dark_80
156+
Thread.State.BLOCKED.name -> com.pluto.plugin.R.color.pluto___red_dark
157+
Thread.State.WAITING.name -> com.pluto.plugin.R.color.pluto___orange
158+
else -> com.pluto.plugin.R.color.pluto___text_dark_80
159159
}
160160
)
161161
)

0 commit comments

Comments
 (0)