commit c16af141e640c4eb8f71e7a5a7d4b9601417a7d1 parent ed4334c429cc27633c1ad389ab8701eb50ab60b8 Author: Caner Karaca <37447503+CanerKaraca23@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:35:50 +0300 chore: update dependencies (#565) * Update libs.versions.toml * fix: proguard rules --------- Co-authored-by: rhunk <101876869+rhunk@users.noreply.github.com> Diffstat:
14 files changed, 50 insertions(+), 57 deletions(-)
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro @@ -3,7 +3,7 @@ -keep enum * { *; } --keep class org.jf.dexlib2.** { *; } +-keep class com.android.tools.smali.dexlib2.** { *; } -keep class org.mozilla.javascript.** { *; } -keep class androidx.compose.material.icons.** { *; } -keep class androidx.compose.material3.R$* { *; } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml @@ -1,28 +1,28 @@ [versions] -agp = "8.2.0" -apksig = "8.2.0" +agp = "8.2.1" +apksig = "8.2.1" libsu = "5.2.2" -guava = "32.1.3-jre" -jsoup = "1.17.1" -kotlin = "1.9.21" +guava = "33.0.0-jre" +jsoup = "1.17.2" +kotlin = "1.9.22" kotlinx-coroutines-android = "1.7.3" -compose-compiler = "1.5.6" +compose-compiler = "1.5.8" activity-ktx = "1.8.2" androidx-documentfile = "1.1.0-alpha01" coil-compose = "2.5.0" navigation-compose = "2.7.6" -osmdroid-android = "6.1.17" +osmdroid-android = "6.1.18" recyclerview = "1.3.2" compose-bom = "2023.10.01" bcprov-jdk18on = "1.77" -dexlib2 = "2.5.2" +dexlib2 = "3.0.3" ffmpeg-kit = "5.1.LTS" # DO NOT UPDATE FFMPEG-KIT TO "5.1" it breaks stuff :3 gson = "2.10.1" -junit = "4.13.2" +junit = "5.10.1" material3 = "1.1.2" -okhttp = "5.0.0-alpha.11" +okhttp = "5.0.0-alpha.12" rhino = "1.7.14" @@ -43,12 +43,12 @@ coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil-compose" } libsu = { module = "com.github.topjohnwu.libsu:core", version.ref = "libsu" } coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines-android" } -dexlib2 = { group = "org.smali", name = "dexlib2", version.ref = "dexlib2" } +dexlib2 = { group = "com.android.tools.smali", name = "smali-dexlib2", version.ref = "dexlib2" } ffmpeg-kit = { group = "com.arthenica", name = "ffmpeg-kit-full-gpl", version.ref = "ffmpeg-kit" } gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } guava = { module = "com.google.guava:guava", version.ref = "guava" } jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" } -junit = { module = "junit:junit", version.ref = "junit" } +junit = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" } okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } osmdroid-android = { group = "org.osmdroid", name = "osmdroid-android", version.ref = "osmdroid-android" } recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" } diff --git a/manager/proguard-rules.pro b/manager/proguard-rules.pro @@ -1,5 +1,5 @@ -dontwarn com.google.errorprone.annotations.** -dontwarn com.google.auto.value.** -keep enum * { *; } --keep class org.jf.dexlib2.** { *; } +-keep class com.android.tools.smali.dexlib2.** { *; } -keep class me.rhunk.snapenhance.manager.ui.tab.** { *; } \ No newline at end of file diff --git a/manager/src/main/kotlin/me/rhunk/snapenhance/manager/patch/util/DexLibExt.kt b/manager/src/main/kotlin/me/rhunk/snapenhance/manager/patch/util/DexLibExt.kt @@ -1,12 +1,12 @@ package me.rhunk.snapenhance.manager.patch.util -import org.jf.dexlib2.Opcodes -import org.jf.dexlib2.dexbacked.DexBackedDexFile -import org.jf.dexlib2.iface.DexFile -import org.jf.dexlib2.iface.reference.StringReference -import org.jf.dexlib2.writer.io.FileDataStore -import org.jf.dexlib2.writer.pool.DexPool -import org.jf.dexlib2.writer.pool.StringPool +import com.android.tools.smali.dexlib2.Opcodes +import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile +import com.android.tools.smali.dexlib2.iface.DexFile +import com.android.tools.smali.dexlib2.iface.reference.StringReference +import com.android.tools.smali.dexlib2.writer.io.FileDataStore +import com.android.tools.smali.dexlib2.writer.pool.DexPool +import com.android.tools.smali.dexlib2.writer.pool.StringPool import java.io.BufferedInputStream import java.io.File import java.io.InputStream diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ClassMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ClassMapper.kt @@ -5,9 +5,9 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import me.rhunk.snapenhance.mapper.impl.* -import org.jf.dexlib2.Opcodes -import org.jf.dexlib2.dexbacked.DexBackedDexFile -import org.jf.dexlib2.iface.ClassDef +import com.android.tools.smali.dexlib2.Opcodes +import com.android.tools.smali.dexlib2.dexbacked.DexBackedDexFile +import com.android.tools.smali.dexlib2.iface.ClassDef import java.io.BufferedInputStream import java.io.InputStream import java.util.zip.ZipFile @@ -90,4 +90,4 @@ class ClassMapper( } return outputJson } -}- \ No newline at end of file +} diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/MapperContext.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/MapperContext.kt @@ -1,6 +1,6 @@ package me.rhunk.snapenhance.mapper -import org.jf.dexlib2.iface.ClassDef +import com.android.tools.smali.dexlib2.iface.ClassDef class MapperContext( private val classMap: Map<String, ClassDef> @@ -17,4 +17,4 @@ class MapperContext( if (name == null) return null return classMap[name.toString()] } -}- \ No newline at end of file +} diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexClassDef.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexClassDef.kt @@ -1,7 +1,7 @@ package me.rhunk.snapenhance.mapper.ext -import org.jf.dexlib2.AccessFlags -import org.jf.dexlib2.iface.ClassDef +import com.android.tools.smali.dexlib2.AccessFlags +import com.android.tools.smali.dexlib2.iface.ClassDef fun ClassDef.isEnum(): Boolean = accessFlags and AccessFlags.ENUM.value != 0 fun ClassDef.isAbstract(): Boolean = accessFlags and AccessFlags.ABSTRACT.value != 0 diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexMethod.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/ext/DexMethod.kt @@ -1,10 +1,10 @@ package me.rhunk.snapenhance.mapper.ext -import org.jf.dexlib2.iface.MethodImplementation -import org.jf.dexlib2.iface.instruction.formats.Instruction21c -import org.jf.dexlib2.iface.instruction.formats.Instruction22c -import org.jf.dexlib2.iface.reference.FieldReference -import org.jf.dexlib2.iface.reference.StringReference +import com.android.tools.smali.dexlib2.iface.MethodImplementation +import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c +import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22c +import com.android.tools.smali.dexlib2.iface.reference.FieldReference +import com.android.tools.smali.dexlib2.iface.reference.StringReference fun MethodImplementation.findConstString(string: String, contains: Boolean = false): Boolean = instructions.filterIsInstance(Instruction21c::class.java).any { (it.reference as? StringReference)?.string?.let { str -> diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/BCryptClassMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/BCryptClassMapper.kt @@ -4,7 +4,7 @@ import me.rhunk.snapenhance.mapper.AbstractClassMapper import me.rhunk.snapenhance.mapper.ext.getClassName import me.rhunk.snapenhance.mapper.ext.getStaticConstructor import me.rhunk.snapenhance.mapper.ext.isFinal -import org.jf.dexlib2.iface.instruction.formats.ArrayPayload +import com.android.tools.smali.dexlib2.iface.instruction.formats.ArrayPayload class BCryptClassMapper : AbstractClassMapper("BCryptClass") { val classReference = classReference("class") @@ -34,4 +34,4 @@ class BCryptClassMapper : AbstractClassMapper("BCryptClass") { } } } -}- \ No newline at end of file +} diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CallbackMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CallbackMapper.kt @@ -4,8 +4,8 @@ import me.rhunk.snapenhance.mapper.AbstractClassMapper import me.rhunk.snapenhance.mapper.ext.getClassName import me.rhunk.snapenhance.mapper.ext.getSuperClassName import me.rhunk.snapenhance.mapper.ext.isFinal -import org.jf.dexlib2.iface.instruction.formats.Instruction21t -import org.jf.dexlib2.iface.instruction.formats.Instruction22t +import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21t +import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction22t class CallbackMapper : AbstractClassMapper("Callbacks") { val callbacks = map("callbacks") @@ -36,4 +36,4 @@ class CallbackMapper : AbstractClassMapper("Callbacks") { callbacks.get()?.putAll(callbackClasses) } } -}- \ No newline at end of file +} diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CompositeConfigurationProviderMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/CompositeConfigurationProviderMapper.kt @@ -5,10 +5,10 @@ import me.rhunk.snapenhance.mapper.ext.findConstString import me.rhunk.snapenhance.mapper.ext.getClassName import me.rhunk.snapenhance.mapper.ext.hasStaticConstructorString import me.rhunk.snapenhance.mapper.ext.isEnum -import org.jf.dexlib2.iface.instruction.formats.Instruction21c -import org.jf.dexlib2.iface.instruction.formats.Instruction35c -import org.jf.dexlib2.iface.reference.FieldReference -import org.jf.dexlib2.iface.reference.MethodReference +import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c +import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c +import com.android.tools.smali.dexlib2.iface.reference.FieldReference +import com.android.tools.smali.dexlib2.iface.reference.MethodReference import java.lang.reflect.Modifier class CompositeConfigurationProviderMapper : AbstractClassMapper("CompositeConfigurationProvider") { @@ -105,4 +105,4 @@ class CompositeConfigurationProviderMapper : AbstractClassMapper("CompositeConfi } } } -}- \ No newline at end of file +} diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/MediaQualityLevelProviderMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/MediaQualityLevelProviderMapper.kt @@ -5,7 +5,7 @@ import me.rhunk.snapenhance.mapper.ext.getClassName import me.rhunk.snapenhance.mapper.ext.hasStaticConstructorString import me.rhunk.snapenhance.mapper.ext.isAbstract import me.rhunk.snapenhance.mapper.ext.isEnum -import org.jf.dexlib2.AccessFlags +import com.android.tools.smali.dexlib2.AccessFlags class MediaQualityLevelProviderMapper : AbstractClassMapper("MediaQualityLevelProvider") { val mediaQualityLevelProvider = classReference("mediaQualityLevelProvider") @@ -40,4 +40,4 @@ class MediaQualityLevelProviderMapper : AbstractClassMapper("MediaQualityLevelPr } } } -}- \ No newline at end of file +} diff --git a/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/OperaViewerParamsMapper.kt b/mapper/src/main/kotlin/me/rhunk/snapenhance/mapper/impl/OperaViewerParamsMapper.kt @@ -3,8 +3,8 @@ package me.rhunk.snapenhance.mapper.impl import me.rhunk.snapenhance.mapper.AbstractClassMapper import me.rhunk.snapenhance.mapper.ext.findConstString import me.rhunk.snapenhance.mapper.ext.getClassName -import org.jf.dexlib2.iface.instruction.formats.Instruction35c -import org.jf.dexlib2.iface.reference.MethodReference +import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c +import com.android.tools.smali.dexlib2.iface.reference.MethodReference class OperaViewerParamsMapper : AbstractClassMapper("OperaViewerParams") { val classReference = classReference("class") @@ -31,4 +31,4 @@ class OperaViewerParamsMapper : AbstractClassMapper("OperaViewerParams") { } } } -}- \ No newline at end of file +} diff --git a/mapper/src/test/kotlin/me/rhunk/snapenhance/mapper/tests/TestMappings.kt b/mapper/src/test/kotlin/me/rhunk/snapenhance/mapper/tests/TestMappings.kt @@ -4,7 +4,7 @@ import com.google.gson.GsonBuilder import kotlinx.coroutines.runBlocking import me.rhunk.snapenhance.mapper.ClassMapper import me.rhunk.snapenhance.mapper.impl.* -import org.junit.Test +import org.junit.jupiter.api.Test import java.io.File