chore: Upgrade dependencies (#1761)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Benjamin 2024-03-10 11:05:47 -07:00 committed by GitHub
parent 088de60c91
commit 6709505e9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 33 additions and 27 deletions

View File

@ -4,7 +4,7 @@ plugins {
alias(libs.plugins.devtools) alias(libs.plugins.devtools)
alias(libs.plugins.about.libraries) alias(libs.plugins.about.libraries)
id("kotlin-parcelize") id("kotlin-parcelize")
kotlin("plugin.serialization") version "1.9.10" kotlin("plugin.serialization") version "1.9.22"
} }
android { android {
@ -82,7 +82,7 @@ android {
buildFeatures.aidl = true buildFeatures.aidl = true
buildFeatures.buildConfig=true buildFeatures.buildConfig=true
composeOptions.kotlinCompilerExtensionVersion = "1.5.3" composeOptions.kotlinCompilerExtensionVersion = "1.5.10"
} }
kotlin { kotlin {

View File

@ -43,7 +43,7 @@ class KeystoreManager(app: Application, private val prefs: PreferencesManager) {
suspend fun regenerate() = withContext(Dispatchers.Default) { suspend fun regenerate() = withContext(Dispatchers.Default) {
val ks = ApkSigner.newKeyStore( val ks = ApkSigner.newKeyStore(
listOf( setOf(
ApkSigner.KeyStoreEntry( ApkSigner.KeyStoreEntry(
DEFAULT, DEFAULT DEFAULT, DEFAULT
) )

View File

@ -2,6 +2,7 @@ package app.revanced.manager.patcher
import android.content.Context import android.content.Context
import app.revanced.library.ApkUtils import app.revanced.library.ApkUtils
import app.revanced.library.ApkUtils.applyTo
import app.revanced.manager.R import app.revanced.manager.R
import app.revanced.manager.patcher.logger.ManagerLogger import app.revanced.manager.patcher.logger.ManagerLogger
import app.revanced.manager.ui.model.State import app.revanced.manager.ui.model.State
@ -105,8 +106,8 @@ class Session(
} }
with(patcher) { with(patcher) {
logger.info("Merging integrations") logger.info("Merging integrations")
acceptIntegrations(integrations) acceptIntegrations(integrations.toSet())
acceptPatches(selectedPatches) acceptPatches(selectedPatches.toSet())
updateProgress(state = State.COMPLETED) // Merging updateProgress(state = State.COMPLETED) // Merging
logger.info("Applying patches...") logger.info("Applying patches...")
@ -117,7 +118,7 @@ class Session(
val result = patcher.get() val result = patcher.get()
val aligned = tempDir.resolve("aligned.apk") val aligned = tempDir.resolve("aligned.apk")
ApkUtils.copyAligned(input, aligned, result) result.applyTo(aligned)
logger.info("Patched apk saved to $aligned") logger.info("Patched apk saved to $aligned")

View File

@ -3,10 +3,9 @@ package app.revanced.manager.ui.component
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
import com.mikepenz.markdown.compose.Markdown import com.mikepenz.markdown.compose.Markdown
import com.mikepenz.markdown.model.markdownColor import com.mikepenz.markdown.m3.markdownColor
import com.mikepenz.markdown.model.markdownTypography import com.mikepenz.markdown.m3.markdownTypography
@Composable @Composable
fun Markdown( fun Markdown(

View File

@ -1,31 +1,31 @@
[versions] [versions]
ktx = "1.12.0" ktx = "1.12.0"
material3 = "1.2.0" material3 = "1.2.1"
ui-tooling = "1.6.2" ui-tooling = "1.6.3"
viewmodel-lifecycle = "2.7.0" viewmodel-lifecycle = "2.7.0"
splash-screen = "1.0.1" splash-screen = "1.0.1"
compose-activity = "1.8.2" compose-activity = "1.8.2"
paging = "3.2.1" paging = "3.2.1"
preferences-datastore = "1.0.0" preferences-datastore = "1.0.0"
work-runtime = "2.9.0" work-runtime = "2.9.0"
compose-bom = "2024.02.01" compose-bom = "2024.02.02"
accompanist = "0.30.1" accompanist = "0.34.0"
serialization = "1.6.0" serialization = "1.6.3"
collection = "0.3.5" collection = "0.3.7"
room-version = "2.6.1" room-version = "2.6.1"
revanced-patcher = "19.1.0" revanced-patcher = "19.3.1"
revanced-library = "1.4.0" revanced-library = "2.2.1"
koin-version = "3.4.3" koin-version = "3.5.3"
koin-version-compose = "3.4.6" koin-version-compose = "3.5.3"
reimagined-navigation = "1.5.0" reimagined-navigation = "1.5.0"
ktor = "2.3.3" ktor = "2.3.9"
markdown-renderer = "0.8.0" markdown-renderer = "0.13.0"
fading-edges = "1.0.4" fading-edges = "1.0.4"
androidGradlePlugin = "8.3.0" androidGradlePlugin = "8.3.0"
kotlinGradlePlugin = "1.9.10" kotlinGradlePlugin = "1.9.22"
devToolsGradlePlugin = "1.9.10-1.0.13" devToolsGradlePlugin = "1.9.10-1.0.13"
aboutLibrariesGradlePlugin = "10.8.3" aboutLibrariesGradlePlugin = "11.1.0"
coil = "2.4.0" coil = "2.6.0"
app-icon-loader-coil = "1.5.0" app-icon-loader-coil = "1.5.0"
skrapeit = "1.2.2" skrapeit = "1.2.2"
libsu = "5.2.1" libsu = "5.2.1"
@ -58,8 +58,6 @@ coil-appiconloader = { group = "me.zhanghai.android.appiconloader", name = "appi
# Accompanist # Accompanist
accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" } accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" }
accompanist-webview = { group = "com.google.accompanist", name = "accompanist-webview", version.ref = "accompanist" } accompanist-webview = { group = "com.google.accompanist", name = "accompanist-webview", version.ref = "accompanist" }
accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }
accompanist-systemuicontroller = { group = "com.google.accompanist", name = "accompanist-systemuicontroller", version.ref = "accompanist" }
accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material", version.ref = "accompanist" } accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material", version.ref = "accompanist" }
# Kotlinx # Kotlinx
@ -98,7 +96,7 @@ skrapeit-dsl = { group = "it.skrape", name = "skrapeit-dsl", version.ref = "skra
skrapeit-parser = { group = "it.skrape", name = "skrapeit-html-parser", version.ref = "skrapeit" } skrapeit-parser = { group = "it.skrape", name = "skrapeit-html-parser", version.ref = "skrapeit" }
# Markdown # Markdown
markdown-renderer = { group = "com.mikepenz", name = "multiplatform-markdown-renderer-android", version.ref = "markdown-renderer" } markdown-renderer = { group = "com.mikepenz", name = "multiplatform-markdown-renderer-m3", version.ref = "markdown-renderer" }
# Fading Edges # Fading Edges
fading-edges = { group = "com.github.GIGAMOLE", name = "ComposeFadingEdges", version.ref = "fading-edges"} fading-edges = { group = "com.github.GIGAMOLE", name = "ComposeFadingEdges", version.ref = "fading-edges"}

View File

@ -14,6 +14,14 @@ dependencyResolutionManagement {
mavenCentral() mavenCentral()
maven("https://jitpack.io") maven("https://jitpack.io")
mavenLocal() mavenLocal()
maven {
// A repository must be speficied for some reason. "registry" is a dummy.
url = uri("https://maven.pkg.github.com/revanced/registry")
credentials {
username = System.getenv("GITHUB_ACTOR") ?: extra["gpr.user"] as String?
password = System.getenv("GITHUB_TOKEN") ?: extra["gpr.key"] as String?
}
}
} }
} }
rootProject.name = "ReVanced Manager" rootProject.name = "ReVanced Manager"