Merge branch 'master' into gradle7

# Conflicts:
#	build.gradle

brut.apktool/apktool-lib/build.gradle

@@ -28,14 +28,12 @@ processResources {
     include '**/*.jar'
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
   }
-  
+
   includeEmptyDirs = false
 }
 
 dependencies {
-    testImplementation("junit:junit:4.10") {
-        exclude(module: 'hamcrest-core')
-    }
+    testImplementation depends.junit
 
     api project(':brut.j.dir'),
         project(':brut.j.util'),
@@ -50,4 +48,4 @@ dependencies {
                    depends.commons_io
 
     testImplementation depends.xmlunit
-}
+}