From 4d3c10e2859d829cdd2e415f76c27b29228f03d8 Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Sun, 7 Jul 2024 09:08:19 -0700
Subject: [PATCH] upgrade to archunit 1.3.0

---
 pom.xml                                              |  4 ++--
 .../java/com/twilio/compliance/ComplianceTest.java   | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e95f1017..d936bf230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,7 +272,7 @@
     <dependency>
       <groupId>com.tngtech.archunit</groupId>
       <artifactId>archunit</artifactId>
-      <version>0.23.0</version>
+      <version>1.3.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -480,4 +480,4 @@
     <artifactId>oss-parent</artifactId>
     <version>7</version>
   </parent>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/test/java/com/twilio/compliance/ComplianceTest.java b/src/test/java/com/twilio/compliance/ComplianceTest.java
index 7b1372706..0ee8995c1 100644
--- a/src/test/java/com/twilio/compliance/ComplianceTest.java
+++ b/src/test/java/com/twilio/compliance/ComplianceTest.java
@@ -6,7 +6,6 @@
 import com.tngtech.archunit.core.domain.JavaModifier;
 import com.tngtech.archunit.core.importer.ClassFileImporter;
 import com.tngtech.archunit.core.importer.ImportOption;
-import com.tngtech.archunit.core.importer.ImportOptions;
 import com.tngtech.archunit.lang.ArchRule;
 import com.tngtech.archunit.lang.syntax.elements.GivenClasses;
 import com.tngtech.archunit.lang.syntax.elements.GivenClassesConjunction;
@@ -15,6 +14,7 @@
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 import static com.tngtech.archunit.core.domain.JavaClass.Predicates.resideInAPackage;
+import static com.tngtech.archunit.core.importer.ImportOption.Predefined.DO_NOT_INCLUDE_TESTS;
 import static com.tngtech.archunit.lang.conditions.ArchConditions.dependOnClassesThat;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
 import static com.tngtech.archunit.library.GeneralCodingRules.*;
@@ -29,15 +29,21 @@
 import java.util.stream.Collectors;
 
 public class ComplianceTest {
-    static final private ImportOptions importOpts = new ImportOptions().with(ImportOption.Predefined.DO_NOT_INCLUDE_TESTS);
+    static final private List<ImportOption> importOpts = buildImportOptions();
     static final private JavaClasses twilioClasses = new ClassFileImporter(importOpts).importPackages("com.twilio");
     static final private List<Class> resourceClasses = getResourceClasses(twilioClasses);
     static final private List<Class> variantClasses = new ArrayList<Class>(); // classes that do not follow the generic template
 
+    private static List<ImportOption> buildImportOptions() {
+        List<ImportOption> options = new ArrayList<ImportOption>();
+        options.add(DO_NOT_INCLUDE_TESTS);
+        return options;
+    }
+
     private static DescribedPredicate<JavaClass> areNotInVariantList() {
         return new DescribedPredicate<JavaClass>("classes that follow the same template pattern") {
             @Override
-            public boolean apply(final JavaClass input) {
+            public boolean test(final JavaClass input) {
                 return !variantClasses.contains(input.getName());
             }
         };