|
1 | 1 | val ScalaNativeVersion = "0.5.8-SNAPSHOT"
|
2 |
| -// Update during release procedure to provide access to staged, but not published artifacts |
3 |
| -val StagingRepoIds = Nil |
4 |
| -val StagingRepoNames = StagingRepoIds.map(id => s"orgscala-native-$id").toSeq |
5 | 2 |
|
6 | 3 | val crossScalaVersions212 = (14 to 20).map("2.12." + _)
|
7 | 4 | val crossScalaVersions213 = (8 to 16).map("2.13." + _)
|
8 | 5 | val crossScalaVersions3 =
|
9 | 6 | (2 to 3).map("3.1." + _) ++
|
10 | 7 | (0 to 2).map("3.2." + _) ++
|
11 |
| - (0 to 4).map("3.3." + _) ++ |
| 8 | + (0 to 6).map("3.3." + _) ++ |
12 | 9 | (0 to 3).map("3.4." + _) ++
|
13 | 10 | (0 to 2).map("3.5." + _) ++
|
14 |
| - (2 to 3).map("3.6." + _) |
| 11 | + (2 to 4).map("3.6." + _) ++ |
| 12 | + (0 to 1).map("3.7." + _) ++ |
| 13 | + Nil |
15 | 14 |
|
16 | 15 | val scala2_12 = crossScalaVersions212.last
|
17 | 16 | val scala2_13 = crossScalaVersions213.last
|
18 | 17 | val scala3 = crossScalaVersions3.last
|
19 | 18 | val scala3PublishVersion = "3.1.3"
|
20 | 19 |
|
| 20 | +sonatypePublishSettings |
| 21 | + |
21 | 22 | val publishScalaVersions = Seq(scala2_12, scala2_13, scala3PublishVersion)
|
22 | 23 |
|
23 | 24 | def scalaReleasesForBinaryVersion(v: String): Seq[String] = v match {
|
@@ -100,7 +101,7 @@ inThisBuild(
|
100 | 101 | )
|
101 | 102 | ),
|
102 | 103 | // Used during the releases
|
103 |
| - resolvers ++= StagingRepoNames.flatMap(Resolver.sonatypeOssRepos(_)), |
| 104 | + resolvers += "Sonatype Central Deployments" at "https://central.sonatype.com/api/v1/publisher/deployments/download/", |
104 | 105 | resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
|
105 | 106 | resolvers += Resolver.mavenCentral,
|
106 | 107 | resolvers += Resolver.defaultLocal
|
@@ -154,9 +155,7 @@ lazy val cliScriptedTests = project
|
154 | 155 | "-Dplugin.version=" + (cli / scalaNativeVersion).value,
|
155 | 156 | "-Dscala.version=" + (cli / scalaVersion).value,
|
156 | 157 | "-Dscala-native-cli=" + cliPath,
|
157 |
| - "-Dscala-native-cli-pack=" + packDir, |
158 |
| - "-Dscalanative.build.staging.resolvers=" + StagingRepoNames |
159 |
| - .mkString(",") |
| 158 | + "-Dscala-native-cli-pack=" + packDir |
160 | 159 | )
|
161 | 160 | },
|
162 | 161 | scriptedBufferLog := false,
|
@@ -306,22 +305,24 @@ lazy val cliPackSettings = Def.settings(
|
306 | 305 | lazy val publishSettings = Def.settings(
|
307 | 306 | Compile / publishArtifact := true,
|
308 | 307 | Test / publishArtifact := false,
|
| 308 | + sonatypePublishSettings |
| 309 | +) |
| 310 | +lazy val sonatypePublishSettings = Def.settings( |
309 | 311 | publishMavenStyle := true,
|
310 | 312 | pomIncludeRepository := (_ => false),
|
311 | 313 | publishTo := {
|
312 |
| - val nexus = "https://oss.sonatype.org/" |
313 |
| - if (isSnapshot.value) |
314 |
| - Some("snapshots" at nexus + "content/repositories/snapshots") |
315 |
| - else |
316 |
| - Some("releases" at nexus + "service/local/staging/deploy/maven2") |
| 314 | + val centralSnapshots = |
| 315 | + "https://central.sonatype.com/repository/maven-snapshots/" |
| 316 | + if (isSnapshot.value) Some("central-snapshots" at centralSnapshots) |
| 317 | + else localStaging.value |
317 | 318 | },
|
318 | 319 | credentials ++= {
|
319 | 320 | for {
|
320 |
| - user <- sys.env.get("MAVEN_USER") |
321 |
| - password <- sys.env.get("MAVEN_PASSWORD") |
| 321 | + user <- sys.env.get("SONATYPE_USER") |
| 322 | + password <- sys.env.get("SONATYPE_PASSWORD") |
322 | 323 | } yield Credentials(
|
323 |
| - realm = "Sonatype Nexus Repository Manager", |
324 |
| - host = "oss.sonatype.org", |
| 324 | + realm = "", |
| 325 | + host = "central.sonatype.com", |
325 | 326 | userName = user,
|
326 | 327 | passwd = password
|
327 | 328 | )
|
|
0 commit comments