Skip to content

Commit d771eab

Browse files
Update ProGuardCORE to 8.0.1
1 parent d9437fa commit d771eab

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
}
1414

1515
group 'com.guardsquare'
16-
version '1.1.1'
16+
version '1.1.2'
1717

1818
java {
1919
toolchain {
@@ -42,7 +42,7 @@ jar {
4242
}
4343

4444
dependencies {
45-
implementation 'com.guardsquare:proguard-core:8.0.0'
45+
implementation 'com.guardsquare:proguard-core:8.0.1'
4646

4747
// dex2jar dependencies.
4848
implementation fileTree(dir: 'libs', include: ['*.jar'])

src/main/java/proguard/kotlin/printer/KotlinSourcePrinter.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -902,11 +902,7 @@ public void visitAnyFunction(Clazz clazz,
902902
KotlinMetadata kotlinMetadata,
903903
KotlinFunctionMetadata kotlinFunctionMetadata)
904904
{
905-
try {
906-
kotlinFunctionMetadata.referencedMethodAccept(clazz, new AllAttributeVisitor(new AnnotationPrinter(KotlinSourcePrinter.this)));
907-
} catch (Exception ignored) {
908-
// TODO: temporary null check until ProGuardCORE 8.0.1 is released
909-
}
905+
kotlinFunctionMetadata.referencedMethodAccept(clazz, new AllAttributeVisitor(new AnnotationPrinter(KotlinSourcePrinter.this)));
910906
kotlinFunctionMetadata.versionRequirementAccept(clazz, kotlinMetadata, this);
911907
print(functionFlags(kotlinFunctionMetadata.flags), true);
912908
print("fun ");

src/main/java/proguard/tools/KotlinMetadataPrinter.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -292,19 +292,12 @@ public void write(int i) { }
292292

293293
// Initialize the other references from the program classes.
294294
programClassPool.classesAccept(
295-
clazz -> {
296-
try {
297-
clazz.accept(
298-
new ClassReferenceInitializer(programClassPool,
299-
new ClassPool(),
300-
nullWarningPrinter,
301-
nullWarningPrinter,
302-
nullWarningPrinter,
303-
null));
304-
} catch (Exception ignored) {
305-
// TODO: callable reference initialization may cause NPE, will be fixed in ProGuardCORE 8.0.1
306-
}
307-
});
295+
new ClassReferenceInitializer(programClassPool,
296+
new ClassPool(),
297+
nullWarningPrinter,
298+
nullWarningPrinter,
299+
nullWarningPrinter,
300+
null));
308301
}
309302

310303
private static String metadataKindToString(int k)

0 commit comments

Comments
 (0)