Skip to content

Commit cb3e1f0

Browse files
committed
remove dependencies from snakeyaml
1 parent 0a31588 commit cb3e1f0

File tree

6 files changed

+0
-149
lines changed

6 files changed

+0
-149
lines changed

brut.apktool/apktool-cli/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ tasks.register('proguard', ProGuardTask) {
8989
dontwarn 'javax.xml.xpath.**'
9090
dontnote '**'
9191
// between Java 1.8 and 1.9, the signature of `flip()` changed, which trips up proguard.
92-
dontwarn 'org.yaml.snakeyaml.scanner.ScannerImpl'
9392

9493
def outPath = jar.getDestinationDirectory().getAsFile().get().toString()
9594
def extension = jar.archiveExtension.get().toString()

brut.apktool/apktool-lib/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939

4040
implementation depends.baksmali
4141
implementation depends.smali
42-
implementation depends.snakeyaml
4342
implementation depends.xmlpull
4443
implementation depends.guava
4544
implementation depends.commons_lang

brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ApkInfo.java

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121
import brut.androlib.res.data.ResConfigFlags;
2222
import brut.directory.DirectoryException;
2323
import brut.directory.FileDirectory;
24-
import org.yaml.snakeyaml.DumperOptions;
25-
import org.yaml.snakeyaml.LoaderOptions;
26-
import org.yaml.snakeyaml.Yaml;
27-
import org.yaml.snakeyaml.introspector.PropertyUtils;
2824

2925
import java.io.*;
3026
import java.util.ArrayList;
@@ -54,26 +50,6 @@ public ApkInfo() {
5450
this.version = ApktoolProperties.getVersion();
5551
}
5652

57-
private static Yaml getYaml() {
58-
DumperOptions dumpOptions = new DumperOptions();
59-
dumpOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
60-
61-
EscapedStringRepresenter representer = new EscapedStringRepresenter();
62-
PropertyUtils propertyUtils = representer.getPropertyUtils();
63-
propertyUtils.setSkipMissingProperties(true);
64-
65-
LoaderOptions loaderOptions = new LoaderOptions();
66-
loaderOptions.setCodePointLimit(10 * 1024 * 1024); // 10mb
67-
68-
return new Yaml(new ClassSafeConstructor(), representer, dumpOptions, loaderOptions);
69-
}
70-
71-
public void save(Writer output) {
72-
DumperOptions options = new DumperOptions();
73-
options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
74-
getYaml().dump(this, output);
75-
}
76-
7753
public String checkTargetSdkVersionBounds() {
7854
int target = mapSdkShorthandToVersion(getTargetSdkVersion());
7955

@@ -157,16 +133,6 @@ private int mapSdkShorthandToVersion(String sdkVersion) {
157133
}
158134
}
159135

160-
// public void save(File file) throws IOException {
161-
// try(
162-
// FileOutputStream fos = new FileOutputStream(file);
163-
// OutputStreamWriter outputStreamWriter = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
164-
// Writer writer = new BufferedWriter(outputStreamWriter)
165-
// ) {
166-
// save(writer);
167-
// }
168-
// }
169-
170136
public void save(File file) throws AndrolibException {
171137
try (
172138
YamlWriter writer = new YamlWriter(new FileOutputStream(file));
@@ -187,17 +153,6 @@ public static ApkInfo load(InputStream is) throws AndrolibException {
187153
return apkInfo;
188154
}
189155

190-
// public static ApkInfo load(File appDir)
191-
// throws AndrolibException {
192-
// try(
193-
// InputStream in = new FileDirectory(appDir).getFileInput("apktool.yml")
194-
// ) {
195-
// return ApkInfo.load(in);
196-
// } catch (DirectoryException | IOException ex) {
197-
// throw new AndrolibException(ex);
198-
// }
199-
// }
200-
201156
public static ApkInfo load(File appDir)
202157
throws AndrolibException {
203158
try(

brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/ClassSafeConstructor.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

brut.apktool/apktool-lib/src/main/java/brut/androlib/apk/EscapedStringRepresenter.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ buildscript {
2626
guava : 'com.google.guava:guava:32.0.1-jre',
2727
junit : 'junit:junit:4.13.2',
2828
proguard_gradle: 'com.guardsquare:proguard-gradle:7.3.2',
29-
snakeyaml : 'org.yaml:snakeyaml:1.32:android',
3029
smali : 'com.android.tools.smali:smali:3.0.3',
3130
xmlpull : 'xpp3:xpp3:1.1.4c',
3231
xmlunit : 'xmlunit:xmlunit:1.6',

0 commit comments

Comments
 (0)