Skip to content

Commit 7567a80

Browse files
Deprecate PublishModule.publishSelfDependency (#5117)
Fix #5116 --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent 6254a72 commit 7567a80

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

bsp/package.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object `package` extends RootModule with build.MillPublishScalaModule with Build
1010
def buildInfoPackageName = "mill.bsp"
1111

1212
def buildInfoMembers = Task {
13-
val workerDep = worker.publishSelfDependency()
13+
val workerDep = worker.artifactMetadata()
1414
Seq(
1515
BuildInfo.Value(
1616
"bsp4jVersion",

main/package.mill

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object `package` extends RootModule with build.MillStableScalaModule with BuildI
5151
BuildInfo.Value("millBinPlatform", build.millBinPlatform(), "Mill binary platform version."),
5252
BuildInfo.Value(
5353
"millDistModule", {
54-
val selfDep = dist.publishSelfDependency()
54+
val selfDep = dist.artifactMetadata()
5555
s"${selfDep.group}:${selfDep.id}"
5656
},
5757
"Coordinates of the module pulling the whole of Mill"
@@ -64,7 +64,7 @@ object `package` extends RootModule with build.MillStableScalaModule with BuildI
6464
distAllDeps.collect { case m: PublishModule => m }
6565
) { mod =>
6666
Task.Anon {
67-
val selfDep = mod.publishSelfDependency()
67+
val selfDep = mod.artifactMetadata()
6868
(
6969
s"${mod.coursierDependency.module.repr}:${mod.coursierDependency.version}",
7070
s"${selfDep.group}:${selfDep.id}:${selfDep.version}"

scalalib/src/mill/javalib/revapi/RevapiModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ trait RevapiModule extends PublishModule {
7171

7272
/** API archive and supplement files (dependencies) to compare against */
7373
def revapiOldFiles: T[Agg[PathRef]] = Task {
74-
val Artifact(group, id, version) = publishSelfDependency()
74+
val Artifact(group, id, version) = artifactMetadata()
7575
defaultResolver().classpath(
7676
Seq(ivy"$group:$id:$version"),
7777
artifactTypes = Some(revapiArtifactTypes())

scalalib/src/mill/scalalib/PublishModule.scala

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ trait PublishModule extends JavaModule { outer =>
7878
*/
7979
def versionScheme: T[Option[VersionScheme]] = Task { None }
8080

81+
@deprecated("Use artifactMetadata instead", since = "0.12.12")
8182
def publishSelfDependency: T[Artifact] = Task {
82-
Artifact(pomSettings().organization, artifactId(), publishVersion())
83+
artifactMetadata()
8384
}
8485

8586
def publishIvyDeps
@@ -118,13 +119,13 @@ trait PublishModule extends JavaModule { outer =>
118119
.filter(!ivyPomDeps.contains(_))
119120

120121
val modulePomDeps = Task.sequence(moduleDepsChecked.collect {
121-
case m: PublishModule => m.publishSelfDependency
122+
case m: PublishModule => m.artifactMetadata
122123
})()
123124
val compileModulePomDeps = Task.sequence(compileModuleDepsChecked.collect {
124-
case m: PublishModule => m.publishSelfDependency
125+
case m: PublishModule => m.artifactMetadata
125126
})()
126127
val runModulePomDeps = Task.sequence(runModuleDepsChecked.collect {
127-
case m: PublishModule => m.publishSelfDependency
128+
case m: PublishModule => m.artifactMetadata
128129
})()
129130

130131
ivyPomDeps ++
@@ -149,13 +150,13 @@ trait PublishModule extends JavaModule { outer =>
149150
.filter(!ivyPomDeps.contains(_))
150151

151152
val modulePomDeps = Task.sequence(moduleDepsChecked.collect {
152-
case m: PublishModule => m.publishSelfDependency
153+
case m: PublishModule => m.artifactMetadata
153154
})()
154155
val compileModulePomDeps = Task.sequence(compileModuleDepsChecked.collect {
155-
case m: PublishModule => m.publishSelfDependency
156+
case m: PublishModule => m.artifactMetadata
156157
})()
157158
val runModulePomDeps = Task.sequence(runModuleDepsChecked.collect {
158-
case m: PublishModule => m.publishSelfDependency
159+
case m: PublishModule => m.artifactMetadata
159160
})()
160161

161162
ivyPomDeps ++

0 commit comments

Comments
 (0)