Downgrade to Java 11

ASSERT-KTH · Jan 19, 2023 · aa75f24 · aa75f24
1 parent 26eadad
commit aa75f24
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt-hotspot'
-          java-version: 17
+          java-version: 11
           server-id: ossrh
           server-username: OSSRH_USERNAME # env variable for username in release
           server-password: OSSRH_TOKEN # env variable for token in release

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
   <!-- Project description-->
   <name>DepTrim</name>
-  <description>DepTrim automatically specializes the software supply chain of dependencies in Maven projects.</description>
+  <description>DepTrim automatically specializes dependencies in Maven projects.</description>
   <url>https://github.com/castor-software/deptrim</url>
 
   <!-- Issues are managed on GitHub -->
@@ -52,10 +52,10 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- Java version -->
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <compiler.release>11</compiler.release>
-    <javadoc.source>17</javadoc.source>
+    <javadoc.source>11</javadoc.source>
     <!-- Plugin versions -->
     <jacoco.maven.plugin>0.8.8</jacoco.maven.plugin>
     <coveralls.maven.plugin>4.3.0</coveralls.maven.plugin>
@@ -358,7 +358,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven.compiler.plugin}</version>
         <configuration>
-          <release>17</release>
+          <release>11</release>
         </configuration>
       </plugin>
       <!-- Maven site -->
@@ -409,7 +409,7 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.10.1</version>
             <configuration>
-              <release>17</release>
+              <release>11</release>
             </configuration>
           </plugin>
           <!-- Maven source plugin -->

diff --git a/src/main/java/se/kth/deptrim/util/FileUtils.java b/src/main/java/se/kth/deptrim/util/FileUtils.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -24,9 +25,19 @@ public class FileUtils {
    * @param directory the directory to delete empty directories from
    */
   public int deleteEmptyDirectories(File directory) {
-    List<File> toBeDeleted = Arrays.stream(Objects.requireNonNull(directory.listFiles())).sorted()
-        .filter(File::isDirectory)
-        .filter(f -> f.listFiles().length == deleteEmptyDirectories(f)).toList();
+    List<File> toSort = new ArrayList<>();
+    for (File f : Objects.requireNonNull(directory.listFiles())) {
+      toSort.add(f);
+    }
+    toSort.sort(null);
+    List<File> toBeDeleted = new ArrayList<>();
+    for (File f : toSort) {
+      if (f.isDirectory()) {
+        if (f.listFiles().length == deleteEmptyDirectories(f)) {
+          toBeDeleted.add(f);
+        }
+      }
+    }
     int size = toBeDeleted.size();
     toBeDeleted.forEach(t -> {
       try {