remove dependencyConstraints from the published gradle module metadata

ben-manes · Dec 4, 2022 · 7321a56 · 7321a56
1 parent 396a940
commit 7321a56
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -46,10 +46,12 @@ allprojects {
   }
 
   dependencies {
-    def deprecated = ['apiElements', 'archives', 'compileClasspath', 'default',
-      'runtimeClasspath', 'runtimeElements', 'testCompileClasspath', 'testRuntimeClasspath']
+    def ignored = [
+      'api', 'apiElements', 'archives', 'compileClasspath', 'compileOnlyApi', 'default',
+      'implementation', 'javadocElements', 'runtimeClasspath', 'runtimeElements', 'runtimeOnly',
+      'sourcesElements', 'testCompileClasspath', 'testRuntimeClasspath']
     configurations.all { configuration ->
-      if (name !in deprecated) {
+      if (name !in ignored) {
         restrictions.each { module, version ->
           constraints.add(configuration.name, module).version { require version }
         }

diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -37,10 +37,6 @@ publishing {
         url = 'https://github.com/ben-manes/caffeine'
         inceptionYear = '2014'
 
-        withXml {
-          asNode().remove(asNode().dependencyManagement)
-        }
-
         scm {
           url = 'https://github.com/ben-manes/caffeine'
           connection = 'scm:git:https://github.com/ben-manes/caffeine.git'

diff --git a/settings.gradle b/settings.gradle
@@ -10,10 +10,10 @@ gradleEnterprise {
   }
   buildScan {
     capture.taskInputFiles = true
-    publishAlways()
 
     if (System.env.CI) {
       uploadInBackground = false
+      publishAlways()
     } else {
       obfuscation.ipAddresses { [] }
     }