Skip to content

Commit 6afae38

Browse files
LennoardLennoard
committed
refactor: upgrade AGP to 8.5.0
1 parent dbd8a45 commit 6afae38

File tree

13 files changed

+57
-69
lines changed

13 files changed

+57
-69
lines changed

‎app/build.gradle.kts‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import java.util.Properties
21
import org.jetbrains.kotlin.config.KotlinCompilerVersion
2+
import java.util.Properties
33

44
plugins {
55
id("com.android.application")
66
kotlin("android")
77
kotlin("kapt")
8+
id("com.google.devtools.ksp")
89
id("kotlin-parcelize")
910
}
1011

@@ -73,7 +74,7 @@ android {
7374
getByName("androidTest").assets.srcDir("$projectDir/schemas")
7475
}
7576

76-
packagingOptions {
77+
packaging {
7778
resources.excludes.addAll(
7879
arrayOf(
7980
"/META-INF/**",
@@ -88,23 +89,19 @@ android {
8889
}
8990

9091
compileOptions {
91-
sourceCompatibility = JavaVersion.VERSION_1_8
92-
targetCompatibility = JavaVersion.VERSION_1_8
92+
sourceCompatibility = JavaVersion.VERSION_17
93+
targetCompatibility = JavaVersion.VERSION_17
9394
}
9495

95-
kotlinOptions {
96-
jvmTarget = "1.8"
96+
kotlin {
97+
jvmToolchain(17)
9798
}
9899

99100
composeOptions {
100101
kotlinCompilerExtensionVersion = Compose.kotlinCompilerExtensionVersion
101102
}
102103
}
103104

104-
kapt {
105-
correctErrorTypes = true
106-
}
107-
108105
dependencies {
109106
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
110107
implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION))
@@ -124,7 +121,7 @@ dependencies {
124121
implementation(AndroidX.room)
125122
implementation(AndroidX.roomRuntime)
126123
implementation(AndroidX.workManager)
127-
kapt(AndroidX.roomCompiler)
124+
ksp(AndroidX.roomCompiler)
128125

129126
implementation(Google.gson)
130127

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/user/UserParamsScreen.kt‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,21 @@ import androidx.compose.foundation.lazy.items
1111
import androidx.compose.foundation.lazy.rememberLazyListState
1212
import androidx.compose.foundation.shape.RoundedCornerShape
1313
import androidx.compose.material.icons.Icons
14-
import androidx.compose.material.icons.outlined.ArrowBack
14+
import androidx.compose.material.icons.automirrored.outlined.ArrowBack
1515
import androidx.compose.material.icons.outlined.Close
1616
import androidx.compose.material.icons.outlined.Search
17-
import androidx.compose.material3.DismissDirection
18-
import androidx.compose.material3.DismissValue
19-
import androidx.compose.material3.Divider
2017
import androidx.compose.material3.ExperimentalMaterial3Api
18+
import androidx.compose.material3.HorizontalDivider
2119
import androidx.compose.material3.Icon
2220
import androidx.compose.material3.IconButton
2321
import androidx.compose.material3.MaterialTheme
2422
import androidx.compose.material3.Scaffold
2523
import androidx.compose.material3.SearchBar
26-
import androidx.compose.material3.SwipeToDismiss
24+
import androidx.compose.material3.SwipeToDismissBox
25+
import androidx.compose.material3.SwipeToDismissBoxValue
2726
import androidx.compose.material3.Text
2827
import androidx.compose.material3.TopAppBar
29-
import androidx.compose.material3.rememberDismissState
28+
import androidx.compose.material3.rememberSwipeToDismissBoxState
3029
import androidx.compose.runtime.Composable
3130
import androidx.compose.runtime.getValue
3231
import androidx.compose.runtime.mutableStateOf
@@ -75,7 +74,7 @@ fun UserParamsScreen(
7574
navigationIcon = {
7675
IconButton(onClick = onBackPressed) {
7776
Icon(
78-
imageVector = Icons.Outlined.ArrowBack,
77+
imageVector = Icons.AutoMirrored.Outlined.ArrowBack,
7978
contentDescription = stringResource(id = R.string.restore_param),
8079
tint = MaterialTheme.colorScheme.onPrimaryContainer
8180
)
@@ -127,9 +126,9 @@ private fun SwipeToDismissContent(
127126
param: KernelParam
128127
) {
129128
val currentParam by rememberUpdatedState(newValue = param)
130-
val dismissState = rememberDismissState(
129+
val dismissState = rememberSwipeToDismissBoxState(
131130
confirmValueChange = {
132-
return@rememberDismissState if (it == DismissValue.DismissedToStart) {
131+
return@rememberSwipeToDismissBoxState if (it == SwipeToDismissBoxValue.EndToStart) {
133132
onDelete(currentParam)
134133
true
135134
} else {
@@ -138,10 +137,10 @@ private fun SwipeToDismissContent(
138137
}
139138
)
140139

141-
SwipeToDismiss(
140+
SwipeToDismissBox(
142141
state = dismissState,
143-
directions = setOf(DismissDirection.EndToStart),
144-
background = {
142+
enableDismissFromEndToStart = true,
143+
backgroundContent = {
145144
Box(
146145
modifier = Modifier
147146
.fillMaxSize()
@@ -155,20 +154,19 @@ private fun SwipeToDismissContent(
155154
tint = MaterialTheme.colorScheme.onError
156155
)
157156
}
158-
},
159-
dismissContent = {
160-
Column(modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
161-
ParamItem(
162-
onParamClick = onParamClick,
163-
param = param
164-
)
165-
Divider(
166-
color = MaterialTheme.colorScheme.outlineVariant,
167-
thickness = 1.dp
168-
)
169-
}
170157
}
171-
)
158+
) {
159+
Column(modifier = Modifier.background(MaterialTheme.colorScheme.background)) {
160+
ParamItem(
161+
onParamClick = onParamClick,
162+
param = param
163+
)
164+
HorizontalDivider(
165+
thickness = 1.dp,
166+
color = MaterialTheme.colorScheme.outlineVariant
167+
)
168+
}
169+
}
172170
}
173171

174172
@OptIn(ExperimentalMaterial3Api::class)

‎build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
plugins {
3+
id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false
4+
}
25

36
buildscript {
47
repositories {
@@ -7,7 +10,7 @@ buildscript {
710
}
811

912
dependencies {
10-
classpath(BuildPlugins.gradle)
13+
classpath("com.android.tools.build:gradle:8.5.0")
1114
classpath(BuildPlugins.kotlin)
1215
}
1316
}

‎buildSrc/src/main/kotlin/BuildPlugins.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ object BuildPlugins {
22
private const val agpVersion = "7.4.2"
33
const val gradle = "com.android.tools.build:gradle:$agpVersion"
44

5-
private const val kotlinVersion = "1.7.20"
5+
private const val kotlinVersion = "1.9.24"
66
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
77
}

‎buildSrc/src/main/kotlin/Compose.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Compose {
2-
const val BoM = "androidx.compose:compose-bom:2023.06.01"
3-
const val kotlinCompilerExtensionVersion = "1.3.2"
2+
const val BoM = "androidx.compose:compose-bom:2024.06.00"
3+
const val kotlinCompilerExtensionVersion = "1.5.14"
44
const val material3 = "androidx.compose.material3:material3"
55
const val material = "androidx.compose.material:material"
66
const val uiTooling = "androidx.compose.ui:ui-tooling"

‎common/design/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ android {
3131
}
3232

3333
compileOptions {
34-
sourceCompatibility = JavaVersion.VERSION_1_8
35-
targetCompatibility = JavaVersion.VERSION_1_8
34+
sourceCompatibility = JavaVersion.VERSION_17
35+
targetCompatibility = JavaVersion.VERSION_17
3636
}
3737

3838
kotlinOptions {
39-
jvmTarget = "1.8"
39+
jvmTarget = "17"
4040
}
4141

4242
composeOptions {

‎common/utils/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ android {
2626
}
2727

2828
compileOptions {
29-
sourceCompatibility = JavaVersion.VERSION_1_8
30-
targetCompatibility = JavaVersion.VERSION_1_8
29+
sourceCompatibility = JavaVersion.VERSION_17
30+
targetCompatibility = JavaVersion.VERSION_17
3131
}
3232

3333
kotlinOptions {
34-
jvmTarget = "1.8"
34+
jvmTarget = "17"
3535
}
3636
}
3737

‎common/utils/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.androidvip.sysctlgui.utils">
4-
5-
</manifest>
2+
<manifest />

‎data/build.gradle.kts‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("com.android.library")
33
kotlin("android")
4-
kotlin("kapt")
4+
id("com.google.devtools.ksp")
55
}
66

77
android {
@@ -29,16 +29,14 @@ android {
2929
}
3030

3131
compileOptions {
32-
sourceCompatibility = JavaVersion.VERSION_1_8
33-
targetCompatibility = JavaVersion.VERSION_1_8
32+
sourceCompatibility = JavaVersion.VERSION_17
33+
targetCompatibility = JavaVersion.VERSION_17
3434
}
3535

36-
kotlinOptions {
37-
jvmTarget = "1.8"
36+
kotlin {
37+
jvmToolchain(17)
3838
}
3939

40-
41-
4240
sourceSets {
4341
maybeCreate("main").java.srcDir("src/main/kotlin")
4442
}
@@ -51,7 +49,7 @@ dependencies {
5149
implementation(AndroidX.preference)
5250
implementation(AndroidX.room)
5351
implementation(AndroidX.roomRuntime)
54-
kapt(AndroidX.roomCompiler)
52+
ksp(AndroidX.roomCompiler)
5553

5654
implementation(Dependencies.libSuCore)
5755
implementation(Google.gson)

‎data/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.androidvip.sysctlgui.data">
4-
5-
6-
</manifest>
2+
<manifest />

0 commit comments

Comments
 (0)