Merge branch 'master' into remove-obsolete-dependency-tweaks

liblit · Jan 15, 2024 · 34be2dc · 34be2dc
2 parents dd3042b + f908bdd
commit 34be2dc
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 26 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 plugins {
   `kotlin-dsl`
   `kotlin-dsl-precompiled-script-plugins`

diff --git a/build-logic/src/main/kotlin/com/ibm/wala/gradle/java.gradle.kts b/build-logic/src/main/kotlin/com/ibm/wala/gradle/java.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 package com.ibm.wala.gradle
 
 // Build configuration for subprojects that include Java source code.
@@ -28,7 +26,7 @@ repositories {
 java.toolchain.languageVersion =
     JavaLanguageVersion.of(property("com.ibm.wala.jdk-version") as String)
 
-base.archivesName = "com.ibm.wala${project.path.replace(':', '.')}"
+base.archivesName = "com.ibm.wala${path.replace(':', '.')}"
 
 configurations {
   resolvable("ecj")
@@ -108,15 +106,15 @@ tasks.named<Test>("test") {
   }
 }
 
-if (project.hasProperty("excludeSlowTests")) {
+if (hasProperty("excludeSlowTests")) {
   dependencies { testImplementation(testFixtures(project(":core"))) }
   tasks.named<Test>("test") { useJUnitPlatform { excludeTags("slow") } }
 }
 
 val ecjCompileTaskProviders =
     sourceSets.map { sourceSet -> JavaCompileUsingEcj.withSourceSet(project, sourceSet) }
 
-project.tasks.named("check") { dependsOn(ecjCompileTaskProviders) }
+tasks.named("check") { dependsOn(ecjCompileTaskProviders) }
 
 tasks.withType<JavaCompile>().configureEach {
   options.run {
@@ -145,7 +143,7 @@ tasks.withType<JavaCompileUsingEcj>().configureEach {
 // fixtures, we extend the main sourceSet to include all
 // test-fixture sources too.  This hack is only applied when
 // WALA itself is an included build.
-if (project.gradle.parent != null) {
+if (gradle.parent != null) {
   afterEvaluate {
     sourceSets["main"].java.srcDirs(sourceSets["testFixtures"].java.srcDirs)
 

diff --git a/build-logic/src/main/kotlin/com/ibm/wala/gradle/publishing.gradle.kts b/build-logic/src/main/kotlin/com/ibm/wala/gradle/publishing.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 package com.ibm.wala.gradle
 
 plugins {
@@ -56,7 +54,7 @@ val mavenPublication =
       }
 
       pom {
-        name = project.properties["POM_NAME"] as String
+        name = property("POM_NAME") as String
         description = "T. J. Watson Libraries for Analysis"
         inceptionYear = "2006"
         url = "https://github.com/wala/WALA"
@@ -128,17 +126,17 @@ val mavenRepository: MavenArtifactRepository =
       url =
           uri(
               (if (isSnapshot)
-                  project.properties.getOrDefault(
+                  properties.getOrDefault(
                       "SNAPSHOT_REPOSITORY_URL",
                       "https://oss.sonatype.org/content/repositories/snapshots/")
               else
-                  project.properties.getOrDefault(
+                  properties.getOrDefault(
                       "RELEASE_REPOSITORY_URL",
                       "https://oss.sonatype.org/service/local/staging/deploy/maven2/"))
                   as String)
       credentials {
-        username = project.properties["SONATYPE_NEXUS_USERNAME"] as String?
-        password = project.properties["SONATYPE_NEXUS_PASSWORD"] as String?
+        username = properties["SONATYPE_NEXUS_USERNAME"] as String?
+        password = properties["SONATYPE_NEXUS_PASSWORD"] as String?
       }
     }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -75,7 +75,7 @@ dependencies {
 tasks.register<Javadoc>("aggregatedJavadocs") {
   description = "Generate javadocs from all child projects as if they were a single project"
   group = "Documentation"
-  destinationDir = layout.buildDirectory.dir("docs/javadoc").get().asFile
+  setDestinationDir(layout.buildDirectory.dir("docs/javadoc").get().asFile)
   title = "${project.name} $version API"
   (options as StandardJavadocDocletOptions).author(true)
   classpath = aggregatedJavadocClasspath

diff --git a/cast/java/ecj/build.gradle.kts b/cast/java/ecj/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 plugins {
   application
   id("com.ibm.wala.gradle.eclipse-maven-central")

diff --git a/cast/java/test/data/build.gradle.kts b/cast/java/test/data/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 import com.ibm.wala.gradle.VerifiedDownload
 import java.net.URI
 import net.ltgt.gradle.errorprone.errorprone

diff --git a/cast/js/build.gradle.kts b/cast/js/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 import com.ibm.wala.gradle.CreatePackageList
 import com.ibm.wala.gradle.VerifiedDownload
 import java.net.URI

diff --git a/cast/js/nodejs/build.gradle.kts b/cast/js/nodejs/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 import com.ibm.wala.gradle.VerifiedDownload
 import java.net.URI
 

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -1,5 +1,3 @@
-@file:Suppress("UnstableApiUsage")
-
 import com.ibm.wala.gradle.CompileKawaScheme
 import com.ibm.wala.gradle.JavaCompileUsingEcj
 import com.ibm.wala.gradle.VerifiedDownload