Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump dependencies #82

Merged
merged 1 commit into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@ android {
proguardFiles 'proguard-base.pro', 'proguard-rules.pro'
}
}

buildFeatures {
compose true
}

if (keystorePropertiesFile.exists()) {
def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
Expand All @@ -69,16 +71,16 @@ android {
}

dependencies {
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.core:core-ktx:1.15.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.activity:activity-compose:1.9.2'
implementation "androidx.navigation:navigation-compose:2.8.1"
implementation "androidx.profileinstaller:profileinstaller:1.4.0"
implementation 'androidx.activity:activity-compose:1.9.3'
implementation "androidx.navigation:navigation-compose:2.8.5"
implementation "androidx.profileinstaller:profileinstaller:1.4.1"
implementation "com.github.topjohnwu.libsu:core:5.2.2"
implementation 'com.squareup.logcat:logcat:0.1'
implementation 'com.google.android.gms:play-services-oss-licenses:17.1.0'
implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
implementation "io.github.fornewid:material-motion-compose-core:1.2.1"
implementation "io.github.fornewid:material-motion-compose-core:2.0.1"

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

def coroutines_version = "1.9.0"
def coroutines_version = "1.10.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"

def lifecycle_version = "2.8.6"
def lifecycle_version = "2.8.7"
implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ class ApkDmInstallActivity : ComponentActivity() {
val bundle = ActivityOptions.makeBasic()
.apply {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON)
splashScreenStyle = SplashScreen.SPLASH_SCREEN_STYLE_ICON
}
}
.toBundle()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.text.ClickableText
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.PermDeviceInformation
import androidx.compose.material3.Card
Expand All @@ -27,8 +26,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.LinkAnnotation
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontFamily
Expand Down Expand Up @@ -149,25 +148,17 @@ fun PermissionSetupNoRoot(
start = startAnnotationIndex,
end = endAnnotationIndex,
)
addStringAnnotation(
tag = "URL",
annotation = stringResource(R.string.setup_adb_link),
addLink(
url = LinkAnnotation.Url(stringResource(R.string.setup_adb_link)),
start = startAnnotationIndex,
end = endAnnotationIndex,
)
}
val uriHandler = LocalUriHandler.current
ClickableText(
Text(
text = annotatedString,
modifier = Modifier.padding(vertical = 24.dp),
style = MaterialTheme.typography.bodyLarge,
) {
annotatedString
.getStringAnnotations("URL", it, it)
.firstOrNull()?.let { stringAnnotation ->
uriHandler.openUri(stringAnnotation.item)
}
}
)

val context = LocalContext.current
val adbCommand = "adb shell $command"
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
kotlin_version = "2.0.20"
compose_bom_version = '2024.09.02'
protobuf_version = '4.28.0'
kotlin_version = "2.1.0"
compose_bom_version = '2024.12.01'
protobuf_version = '4.29.2'
}
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
dependencies {
classpath 'com.android.tools.build:gradle:8.6.1'
classpath 'com.android.tools.build:gradle:8.7.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.6'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
2 changes: 1 addition & 1 deletion spotless.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apply plugin: 'com.diffplug.spotless'
spotless {
kotlin {
target '**/*.kt'
targetExclude("$buildDir/**/*.kt")
targetExclude("${rootProject.layout.buildDirectory}/**/*.kt")
targetExclude('bin/**/*.kt')

ktlint()
Expand Down
Loading