Merge pull request #470 from kennethshackleton/gradle-8.3

Gradle 8.3.
bloomberg · Sep 9, 2023 · 9e51b7d · 9e51b7d
2 parents c76d2a0 + e21ad3a
commit 9e51b7d
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/OpenSSL/build.gradle.kts b/OpenSSL/build.gradle.kts
@@ -36,7 +36,7 @@ val openSslBaseUrl = "https://www.openssl.org/source"
 fun Project.openSslUrl() = "$openSslBaseUrl/openssl-${openSslVersion()}.tar.gz"
 fun Project.openSslPgpUrl() = "$openSslBaseUrl/openssl-${openSslVersion()}.tar.gz.asc"
 
-val archive = File("$buildDir/tmp/openssl-${openSslVersion()}.tar.gz")
+val archive = File("${layout.buildDirectory.get()}/tmp/openssl-${openSslVersion()}.tar.gz")
 val archivePgp = File("${archive.path}.asc")
 
 tasks.register<Download>("downloadOpenSslPgp") {
@@ -83,14 +83,14 @@ tasks.register<Exec>("verifyOpenSslSignature") {
 }
 
 fun openSslWorkingDir(target: String) = archive.run {
-    File("$buildDir/generated/$target/${name.substringBefore(".tar.gz")}")
+    File("${layout.buildDirectory.get()}/generated/$target/${name.substringBefore(".tar.gz")}")
 }.path
 
 arrayOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64").forEach {
     val titleCaseName = it.replaceFirstChar { c -> c.uppercaseChar() }
     tasks.register<Copy>("unpackOpenSsl$titleCaseName") {
         from(tarTree(archive))
-        into("$buildDir/generated/$it")
+        into("${layout.buildDirectory.get()}/generated/$it")
         dependsOn("downloadOpenSsl")
     }
 
@@ -100,12 +100,13 @@ arrayOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64").forEach {
         inputs.property("version", openSslVersion())
         outputs.files(fileTree("${openSslWorkingDir(it)}/include") { include("**/*.h") })
             .withPropertyName("headers")
-        outputs.dir("$buildDir/libs/$it").withPropertyName("lib")
+        outputs.dir("${layout.buildDirectory.get()}/libs/$it").withPropertyName("lib")
         outputs.cacheIf { true }
         workingDir(projectDir)
         commandLine("./build_libraries.sh")
         args(
-            archive.run { File("$buildDir/generated/$it/${name.substringBefore(".tar.gz")}") }.path,
+            archive.run { File("${layout.buildDirectory.get()}/generated" +
+                "/$it/${name.substringBefore(".tar.gz")}") }.path,
             it,
             21
         )
@@ -134,7 +135,7 @@ val openSslWorkingDir: String = openSslWorkingDir(targetIdentifier())
 // FIXME Some of the host building logic parallels Android's above. Re-purpose?
 tasks.register<Copy>("unpackOpenSslHost") {
     from(tarTree(archive))
-    into("$buildDir/generated/${targetIdentifier()}")
+    into("${layout.buildDirectory.get()}/generated/${targetIdentifier()}")
     dependsOn("downloadOpenSsl")
     mustRunAfter("clean")
 }
@@ -171,7 +172,7 @@ tasks.register<Copy>("assembleHost") {
     dependsOn("makeHost")
     inputs.property("target", targetIdentifier())
     inputs.property("version", openSslVersion())
-    val outputDir = "$buildDir/libs/${targetIdentifier()}"
+    val outputDir = "${layout.buildDirectory.get()}/libs/${targetIdentifier()}"
     outputs.dir(outputDir).withPropertyName("libs")
     outputs.cacheIf { true }
     from(fileTree(openSslWorkingDir) {

diff --git a/Selektric/build.gradle.kts b/Selektric/build.gradle.kts
@@ -66,7 +66,7 @@ tasks.register<Copy>("copyLibraries") {
     from(fileTree(".cxx-host") {
         include("**/*.dll", "**/*.dylib", "**/*.so")
     })
-    into("$buildDir/intermediates/libs/${platformIdentifier()}")
+    into("${layout.buildDirectory.get()}/intermediates/libs/${platformIdentifier()}")
 }
 
 tasks.register<Delete>("deleteCxxHost") {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=7c3ad722e9b0ce8205b91560fd6ce8296ac3eadf065672242fd73c06b8eeb6ee
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionSha256Sum=bb09982fdf52718e4c7b25023d10df6d35a5fff969860bdf5a5bd27a3ab27a9e
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/selekt-android/build.gradle.kts b/selekt-android/build.gradle.kts
@@ -32,6 +32,7 @@ repositories {
 
 android {
     compileSdk = Versions.ANDROID_SDK.version.toInt()
+    @Suppress("UnstableApiUsage")
     buildToolsVersion = Versions.ANDROID_BUILD_TOOLS.version
     namespace = "com.bloomberg.selekt.android"
     defaultConfig {
@@ -51,7 +52,7 @@ android {
     arrayOf("debug", "main", "release", "test").forEach {
         sourceSets[it].java.srcDir("src/$it/kotlin")
     }
-    sourceSets["test"].resources.srcDir("$buildDir/intermediates/libs")
+    sourceSets["test"].resources.srcDir("${layout.buildDirectory.get()}/intermediates/libs")
     publishing {
         singleVariant("release") {
             withJavadocJar()
@@ -91,10 +92,10 @@ koverReport {
 
 tasks.register<Copy>("copyJniLibs") {
     from(
-        fileTree("${project(":selekt-sqlite3").buildDir.absolutePath}/intermediates/libs"),
-        fileTree("${project(":Selektric").buildDir.absolutePath}/intermediates/libs")
+        fileTree("${project(":selekt-sqlite3").layout.buildDirectory.get()}/intermediates/libs"),
+        fileTree("${project(":Selektric").layout.buildDirectory.get()}/intermediates/libs")
     )
-    into("${buildDir.path}/intermediates/libs/jni")
+    into("${layout.buildDirectory.get()}/intermediates/libs/jni")
 }
 
 tasks.register<Task>("buildNativeHost") {

diff --git a/selekt-java/build.gradle.kts b/selekt-java/build.gradle.kts
@@ -44,7 +44,7 @@ sourceSets {
     create("integrationTest") {
         compileClasspath += sourceSets.main.get().output
         runtimeClasspath += sourceSets.main.get().output
-        resources.srcDir("$buildDir/intermediates/libs")
+        resources.srcDir("${layout.buildDirectory.get()}/intermediates/libs")
     }
 }
 
@@ -88,8 +88,8 @@ tasks.register<Task>("buildHostSQLite") {
 }
 
 tasks.register<Copy>("copyJniLibs") {
-    from(fileTree("${project(":selekt-sqlite3").buildDir}/intermediates/libs"))
-    into("${buildDir.path}/intermediates/libs/jni")
+    from(fileTree("${project(":selekt-sqlite3").layout.buildDirectory.get()}/intermediates/libs"))
+    into("${layout.buildDirectory.get()}/intermediates/libs/jni")
 }
 
 tasks.withType<ProcessResources>().configureEach {

diff --git a/selekt-sqlite3/build.gradle.kts b/selekt-sqlite3/build.gradle.kts
@@ -152,7 +152,7 @@ fun platformIdentifier() = "${osName()}-${System.getProperty("os.arch")}"
 tasks.register<Copy>("buildHost") {
     dependsOn("makeSQLite")
     from(".cxx-host/sqlite3")
-    into("$buildDir/intermediates/libs/${platformIdentifier()}")
+    into("${layout.buildDirectory.get()}/intermediates/libs/${platformIdentifier()}")
     include("*.dll", "*.dylib", "*.so")
 }