diff --git a/AndroidCompat/build.gradle.kts b/AndroidCompat/build.gradle.kts index 9ca92f9a..c7f80f17 100644 --- a/AndroidCompat/build.gradle.kts +++ b/AndroidCompat/build.gradle.kts @@ -20,16 +20,9 @@ dependencies { // Android stub library implementation(fileTree("lib/")) - - // Android JAR libs -// compileOnly( fileTree(dir: new File(rootProject.rootDir, "libs/other"), include: "*.jar") - // JSON compileOnly("com.google.code.gson:gson:2.8.6") - // Javassist - compileOnly("org.javassist:javassist:3.27.0-GA") - // XML compileOnly(group= "xmlpull", name= "xmlpull", version= "1.1.3.1") @@ -43,10 +36,8 @@ dependencies { compileOnly("androidx.annotation:annotation:1.2.0-alpha01") // substitute for duktape-android - // 'org.mozilla:rhino' includes some code that we don't need so use 'org.mozilla:rhino-runtime' instead - implementation("org.mozilla:rhino-runtime:1.7.13") - // 'org.mozilla:rhino-engine' provides the same interface as 'javax.script' a.k.a Nashorn - implementation("org.mozilla:rhino-engine:1.7.13") + implementation("org.mozilla:rhino-runtime:1.7.13") // slimmer version of 'org.mozilla:rhino' + implementation("org.mozilla:rhino-engine:1.7.13") // provides the same interface as 'javax.script' a.k.a Nashorn // Kotlin wrapper around Java Preferences, makes certain things easier val multiplatformSettingsVersion = "0.7.7" diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt index f88d0a7e..5a52b1ff 100644 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt +++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/AndroidCompatInitializer.kt @@ -2,7 +2,6 @@ package xyz.nulldev.androidcompat import org.kodein.di.DI import org.kodein.di.conf.global -import xyz.nulldev.androidcompat.bytecode.ModApplier import xyz.nulldev.androidcompat.config.ApplicationInfoConfigModule import xyz.nulldev.androidcompat.config.FilesConfigModule import xyz.nulldev.androidcompat.config.SystemConfigModule @@ -12,12 +11,7 @@ import xyz.nulldev.ts.config.GlobalConfigManager * Initializes the Android compatibility module */ class AndroidCompatInitializer { - - val modApplier by lazy { ModApplier() } - fun init() { - modApplier.apply() - DI.global.addImport(AndroidCompatModule().create()) //Register config modules diff --git a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/bytecode/ModApplier.kt b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/bytecode/ModApplier.kt deleted file mode 100644 index 535146cf..00000000 --- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/bytecode/ModApplier.kt +++ /dev/null @@ -1,22 +0,0 @@ -package xyz.nulldev.androidcompat.bytecode - -import javassist.CtClass -import mu.KotlinLogging - -/** - * Applies Javassist modifications - */ - -class ModApplier { - - val logger = KotlinLogging.logger {} - - fun apply() { - logger.info { "Applying Javassist mods..." } - val modifiedClasses = mutableListOf() - - modifiedClasses.forEach { - it.toClass() - } - } -} \ No newline at end of file