upgrade gradle to 7.0

aosp/boot_signer/build.gradle.kts

@@ -20,6 +20,7 @@ val fatJar = task("fatJar", type = Jar::class) {
     }
     from(configurations.runtimeClasspath.get().map({ if (it.isDirectory) it else zipTree(it) }))
     excludes.addAll(mutableSetOf("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA"))
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     with(tasks.jar.get() as CopySpec)
 }
 

bbootimg/build.gradle.kts

@@ -10,8 +10,15 @@ repositories {
 }
 
 dependencies {
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    }
+
+    //kotlin
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
+
     implementation("org.slf4j:slf4j-simple:1.7.30")
     implementation("org.slf4j:slf4j-api:1.7.30")
     implementation("com.fasterxml.jackson.core:jackson-annotations:2.12.1")
@@ -46,6 +53,7 @@ tasks {
         }
         from(configurations.runtimeClasspath.get().map({ if (it.isDirectory) it else zipTree(it) }))
         excludes.addAll(mutableSetOf("META-INF/*.RSA", "META-INF/*.SF", "META-INF/*.DSA"))
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         dependsOn(":helper:jar")
     }
     test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

helper/build.gradle.kts

@@ -10,9 +10,14 @@ repositories {
 }
 
 dependencies {
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    }
+    //kotlin
     implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
+
     implementation("com.google.guava:guava:18.0")
     implementation("org.slf4j:slf4j-api:1.7.30")
     implementation("org.slf4j:slf4j-simple:1.7.30")

integrationTest.py

@@ -28,32 +28,23 @@ def deleteIfExists(inFile):
     for i in range(3):
         try:
             if os.path.isfile(inFile):
+                log.info("rm %s" % inFile)
                 os.remove(inFile)
             return
         except Exception as e:
-            log.warn("Exception in cleaning up %s" % inFile)
+            log.warning("Exception in cleaning up %s" % inFile)
             time.sleep(3)
 
 def cleanUp():
     log.info("clean up ...")
     shutil.rmtree("build", ignore_errors = True)
-    deleteIfExists("boot.img")
+    [deleteIfExists(item) for item in [
-    deleteIfExists("boot.img.clear")
+        "boot.img", "boot.img.clear", "boot.img.google", "boot.img.signed", "boot.img.signed2",
-    deleteIfExists("boot.img.google")
+        "recovery.img", "recovery.img.clear", "recovery.img.google", "recovery.img.signed", "recovery.img.signed2",
-    deleteIfExists("boot.img.signed")
+        "vbmeta.img", "vbmeta.img.signed",
-    deleteIfExists("boot.img.signed2")
+        "vendor_boot.img", "vendor_boot.img.clear", "vendor_boot.img.google", "vendor_boot.img.signed", "vendor_boot.img.signed2",
-    deleteIfExists("recovery.img")
+        "boot-debug.img", "boot-debug.img.clear", "boot-debug.img.google",
-    deleteIfExists("recovery.img.clear")
+        "vendor_boot-debug.img", "vendor_boot-debug.img.clear", "vendor_boot-debug.img.google" ]]
-    deleteIfExists("recovery.img.google")
-    deleteIfExists("recovery.img.signed")
-    deleteIfExists("recovery.img.signed2")
-    deleteIfExists("vbmeta.img")
-    deleteIfExists("vbmeta.img.signed")
-    deleteIfExists("vendor_boot.img")
-    deleteIfExists("vendor_boot.img.clear")
-    deleteIfExists("vendor_boot.img.google")
-    deleteIfExists("vendor_boot.img.signed")
-    deleteIfExists("vendor_boot.img.signed2")
 
 def verifySingleJson(jsonFile, func = None):
     log.info(jsonFile)

settings.gradle.kts

@@ -1,3 +1,4 @@
+rootProject.name = "boot"
 include("bbootimg")
 include("aosp:boot_signer")
 include("aosp:mkbootfs.10")

src/integrationTest/resources

@@ -1 +1 @@
-Subproject commit 4e33de46af830f1b0296a72187d501b2ab544224
+Subproject commit 3714e200116ea12cf4d1d462d443177ecc21222a