Skip to content

Commit 0216aaf

Browse files
arkonivaniskandar
authored andcommitted
chore: bump dependencies
1 parent fbdc507 commit 0216aaf

File tree

6 files changed

+21
-28
lines changed

6 files changed

+21
-28
lines changed

app/build.gradle

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ android {
4343
proguardFiles 'proguard-base.pro', 'proguard-rules.pro'
4444
}
4545
}
46+
4647
buildFeatures {
4748
compose true
4849
}
50+
4951
if (keystorePropertiesFile.exists()) {
5052
def keystoreProperties = new Properties()
5153
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
@@ -69,16 +71,16 @@ android {
6971
}
7072

7173
dependencies {
72-
implementation 'androidx.core:core-ktx:1.13.1'
74+
implementation 'androidx.core:core-ktx:1.15.0'
7375
implementation 'androidx.appcompat:appcompat:1.7.0'
74-
implementation 'androidx.activity:activity-compose:1.9.2'
75-
implementation "androidx.navigation:navigation-compose:2.8.1"
76-
implementation "androidx.profileinstaller:profileinstaller:1.4.0"
76+
implementation 'androidx.activity:activity-compose:1.9.3'
77+
implementation "androidx.navigation:navigation-compose:2.8.5"
78+
implementation "androidx.profileinstaller:profileinstaller:1.4.1"
7779
implementation "com.github.topjohnwu.libsu:core:5.2.2"
7880
implementation 'com.squareup.logcat:logcat:0.1'
7981
implementation 'com.google.android.gms:play-services-oss-licenses:17.1.0'
8082
implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
81-
implementation "io.github.fornewid:material-motion-compose-core:1.2.1"
83+
implementation "io.github.fornewid:material-motion-compose-core:2.0.1"
8284

8385
implementation platform("androidx.compose:compose-bom-alpha:$compose_bom_version")
8486
implementation "androidx.compose.ui:ui"
@@ -94,11 +96,11 @@ dependencies {
9496
implementation "com.google.accompanist:accompanist-navigation-material:$accompanist_version"
9597
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"
9698

97-
def coroutines_version = "1.9.0"
99+
def coroutines_version = "1.10.1"
98100
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
99101
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
100102

101-
def lifecycle_version = "2.8.6"
103+
def lifecycle_version = "2.8.7"
102104
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
103105
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
104106
implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"

app/src/main/java/xyz/ivaniskandar/shouko/activity/ApkDmInstallActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ class ApkDmInstallActivity : ComponentActivity() {
343343
val bundle = ActivityOptions.makeBasic()
344344
.apply {
345345
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
346-
setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON)
346+
splashScreenStyle = SplashScreen.SPLASH_SCREEN_STYLE_ICON
347347
}
348348
}
349349
.toBundle()

app/src/main/java/xyz/ivaniskandar/shouko/ui/destination/PermissionSetup.kt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize
1010
import androidx.compose.foundation.layout.fillMaxWidth
1111
import androidx.compose.foundation.layout.padding
1212
import androidx.compose.foundation.layout.size
13-
import androidx.compose.foundation.text.ClickableText
1413
import androidx.compose.material.icons.Icons
1514
import androidx.compose.material.icons.rounded.PermDeviceInformation
1615
import androidx.compose.material3.Card
@@ -27,8 +26,8 @@ import androidx.compose.ui.Alignment
2726
import androidx.compose.ui.Modifier
2827
import androidx.compose.ui.graphics.Color
2928
import androidx.compose.ui.platform.LocalContext
30-
import androidx.compose.ui.platform.LocalUriHandler
3129
import androidx.compose.ui.res.stringResource
30+
import androidx.compose.ui.text.LinkAnnotation
3231
import androidx.compose.ui.text.SpanStyle
3332
import androidx.compose.ui.text.buildAnnotatedString
3433
import androidx.compose.ui.text.font.FontFamily
@@ -149,25 +148,17 @@ fun PermissionSetupNoRoot(
149148
start = startAnnotationIndex,
150149
end = endAnnotationIndex,
151150
)
152-
addStringAnnotation(
153-
tag = "URL",
154-
annotation = stringResource(R.string.setup_adb_link),
151+
addLink(
152+
url = LinkAnnotation.Url(stringResource(R.string.setup_adb_link)),
155153
start = startAnnotationIndex,
156154
end = endAnnotationIndex,
157155
)
158156
}
159-
val uriHandler = LocalUriHandler.current
160-
ClickableText(
157+
Text(
161158
text = annotatedString,
162159
modifier = Modifier.padding(vertical = 24.dp),
163160
style = MaterialTheme.typography.bodyLarge,
164-
) {
165-
annotatedString
166-
.getStringAnnotations("URL", it, it)
167-
.firstOrNull()?.let { stringAnnotation ->
168-
uriHandler.openUri(stringAnnotation.item)
169-
}
170-
}
161+
)
171162

172163
val context = LocalContext.current
173164
val adbCommand = "adb shell $command"

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33
ext {
4-
kotlin_version = "2.0.20"
5-
compose_bom_version = '2024.09.02'
6-
protobuf_version = '4.28.0'
4+
kotlin_version = "2.1.0"
5+
compose_bom_version = '2024.12.01'
6+
protobuf_version = '4.29.2'
77
}
88
repositories {
99
google()
1010
mavenCentral()
1111
maven { url 'https://jitpack.io' }
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:8.6.1'
14+
classpath 'com.android.tools.build:gradle:8.7.3'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
1717
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
33
distributionPath=wrapper/dists
44
zipStorePath=wrapper/dists
55
zipStoreBase=GRADLE_USER_HOME

spotless.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'com.diffplug.spotless'
33
spotless {
44
kotlin {
55
target '**/*.kt'
6-
targetExclude("$buildDir/**/*.kt")
6+
targetExclude("${rootProject.layout.buildDirectory}/**/*.kt")
77
targetExclude('bin/**/*.kt')
88

99
ktlint()

0 commit comments

Comments
 (0)