From d771eabad6f35af90bdbe23feb08e0b9a3014781 Mon Sep 17 00:00:00 2001
From: James Hamilton <james.hamilton@guardsquare.com>
Date: Thu, 12 Aug 2021 20:35:53 +0200
Subject: [PATCH] Update ProGuardCORE to 8.0.1

---
 build.gradle                                  |  4 ++--
 .../kotlin/printer/KotlinSourcePrinter.java   |  6 +-----
 .../proguard/tools/KotlinMetadataPrinter.java | 19 ++++++-------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 963edf7..7a15f94 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 group 'com.guardsquare'
-version '1.1.1'
+version '1.1.2'
 
 java {
     toolchain {
@@ -42,7 +42,7 @@ jar {
 }
 
 dependencies {
-    implementation 'com.guardsquare:proguard-core:8.0.0'
+    implementation 'com.guardsquare:proguard-core:8.0.1'
 
     // dex2jar dependencies.
     implementation fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/src/main/java/proguard/kotlin/printer/KotlinSourcePrinter.java b/src/main/java/proguard/kotlin/printer/KotlinSourcePrinter.java
index 8d9acea..eeb41ac 100644
--- a/src/main/java/proguard/kotlin/printer/KotlinSourcePrinter.java
+++ b/src/main/java/proguard/kotlin/printer/KotlinSourcePrinter.java
@@ -902,11 +902,7 @@ public void visitAnyFunction(Clazz                  clazz,
                                      KotlinMetadata         kotlinMetadata,
                                      KotlinFunctionMetadata kotlinFunctionMetadata)
         {
-            try {
-                kotlinFunctionMetadata.referencedMethodAccept(clazz, new AllAttributeVisitor(new AnnotationPrinter(KotlinSourcePrinter.this)));
-            } catch (Exception ignored) {
-                // TODO: temporary null check until ProGuardCORE 8.0.1 is released
-            }
+            kotlinFunctionMetadata.referencedMethodAccept(clazz, new AllAttributeVisitor(new AnnotationPrinter(KotlinSourcePrinter.this)));
             kotlinFunctionMetadata.versionRequirementAccept(clazz, kotlinMetadata, this);
             print(functionFlags(kotlinFunctionMetadata.flags), true);
             print("fun ");
diff --git a/src/main/java/proguard/tools/KotlinMetadataPrinter.java b/src/main/java/proguard/tools/KotlinMetadataPrinter.java
index 6bfb7fa..57f9dc8 100644
--- a/src/main/java/proguard/tools/KotlinMetadataPrinter.java
+++ b/src/main/java/proguard/tools/KotlinMetadataPrinter.java
@@ -292,19 +292,12 @@ public void write(int i) { }
 
         // Initialize the other references from the program classes.
         programClassPool.classesAccept(
-            clazz -> {
-                try {
-                    clazz.accept(
-                            new ClassReferenceInitializer(programClassPool,
-                            new ClassPool(),
-                            nullWarningPrinter,
-                            nullWarningPrinter,
-                            nullWarningPrinter,
-                            null));
-                } catch (Exception ignored) {
-                    // TODO: callable reference initialization may cause NPE, will be fixed in ProGuardCORE 8.0.1
-                }
-            });
+            new ClassReferenceInitializer(programClassPool,
+                                          new ClassPool(),
+                                          nullWarningPrinter,
+                                          nullWarningPrinter,
+                                          nullWarningPrinter,
+                                          null));
     }
 
     private static String metadataKindToString(int k)