Skip to content

Commit 63096e9

Browse files
xerialxerial
committed
Upgrade to sbt-sonatype-0.3.3
1 parent d3c96c3 commit 63096e9

File tree

4 files changed

+55
-58
lines changed

4 files changed

+55
-58
lines changed

‎project/Build.scala‎

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ import sbtrelease.ReleaseStateTransformations._
2626
import sbtrelease.ReleaseStep
2727
import scala.util.Properties
2828
import com.typesafe.sbt.pgp.PgpKeys
29-
import xerial.sbt.Sonatype.SonatypeKeys._
29+
import xerial.sbt.Sonatype
30+
import Sonatype.SonatypeKeys._
3031

3132
object Build extends Build {
3233

@@ -50,13 +51,6 @@ object Build extends Build {
5051
concurrentRestrictions in Global := Seq(
5152
Tags.limit(Tags.Test, 1)
5253
),
53-
publishTo := {
54-
val nexus = "https://oss.sonatype.org/"
55-
if (isSnapshot.value)
56-
Some("snapshots" at nexus + "content/repositories/snapshots")
57-
else
58-
Some("releases" at nexus + "service/local/staging/deploy/maven2")
59-
},
6054
ReleaseKeys.tagName <<= (version in ThisBuild) map (v => v),
6155
ReleaseKeys.releaseProcess := Seq[ReleaseStep](
6256
checkSnapshotDependencies,
@@ -95,51 +89,7 @@ object Build extends Build {
9589
opts
9690
},
9791
findbugsReportType := Some(ReportType.FancyHtml),
98-
findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html"),
99-
pomExtra := {
100-
<url>http://msgpack.org/</url>
101-
<licenses>
102-
<license>
103-
<name>Apache 2</name>
104-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
105-
</license>
106-
</licenses>
107-
<scm>
108-
<connection>scm:git:github.com/msgpack/msgpack-java.git</connection>
109-
<developerConnection>scm:git:git@github.com:msgpack/msgpack-java.git</developerConnection>
110-
<url>github.com/msgpack/msgpack-java.git</url>
111-
</scm>
112-
<properties>
113-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
114-
</properties>
115-
<developers>
116-
<developer>
117-
<id>frsyuki</id>
118-
<name>Sadayuki Furuhashi</name>
119-
<email>frsyuki@users.sourceforge.jp</email>
120-
</developer>
121-
<developer>
122-
<id>muga</id>
123-
<name>Muga Nishizawa</name>
124-
<email>muga.nishizawa@gmail.com</email>
125-
</developer>
126-
<developer>
127-
<id>oza</id>
128-
<name>Tsuyoshi Ozawa</name>
129-
<url>https://github.com/oza</url>
130-
</developer>
131-
<developer>
132-
<id>komamitsu</id>
133-
<name>Mitsunori Komatsu</name>
134-
<email>komamitsu@gmail.com</email>
135-
</developer>
136-
<developer>
137-
<id>xerial</id>
138-
<name>Taro L. Saito</name>
139-
<email>leo@xerial.org</email>
140-
</developer>
141-
</developers>
142-
}
92+
findbugsReportPath := Some(crossTarget.value / "findbugs" / "report.html")
14393
)
14494

14595
import Dependencies._
@@ -167,7 +117,7 @@ object Build extends Build {
167117
description := "Core library of the MessagePack for Java",
168118
libraryDependencies ++= testLib
169119
)
170-
)
120+
).disablePlugins(Sonatype)
171121

172122
lazy val msgpackJackson = Project(
173123
id = "msgpack-jackson",
@@ -178,7 +128,7 @@ object Build extends Build {
178128
libraryDependencies ++= jacksonLib,
179129
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v")
180130
)
181-
).dependsOn(msgpackCore)
131+
).disablePlugins(Sonatype).dependsOn(msgpackCore)
182132

183133
object Dependencies {
184134

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
33

4-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
4+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.3.3")
55

66
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
77

‎sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ init_default_option_file () {
119119

120120
declare -r cms_opts="-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC"
121121
declare -r jit_opts="-XX:ReservedCodeCacheSize=256m -XX:+TieredCompilation"
122-
declare -r default_jvm_opts="-ea -Dfile.encoding=UTF8 -XX:MaxPermSize=384m -Xms512m -Xmx1536m -Xss2m $jit_opts $cms_opts"
122+
declare -r default_jvm_opts="-ea -Dfile.encoding=UTF8 -Xms512m -Xmx1536m -Xss2m $jit_opts $cms_opts"
123123
declare -r noshare_opts="-Dsbt.global.base=project/.sbtboot -Dsbt.boot.directory=project/.boot -Dsbt.ivy.home=project/.ivy"
124124
declare -r latest_28="2.8.2"
125125
declare -r latest_29="2.9.3"

‎sonatype.sbt‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,48 @@
1-
sonatypeSettings
1+
import SonatypeKeys._
2+
3+
sonatypeProfileName := "org.msgpack"
4+
5+
pomExtra := {
6+
<url>http://msgpack.org/</url>
7+
<licenses>
8+
<license>
9+
<name>Apache 2</name>
10+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
11+
</license>
12+
</licenses>
13+
<scm>
14+
<connection>scm:git:github.com/msgpack/msgpack-java.git</connection>
15+
<developerConnection>scm:git:git@github.com:msgpack/msgpack-java.git</developerConnection>
16+
<url>github.com/msgpack/msgpack-java.git</url>
17+
</scm>
18+
<properties>
19+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20+
</properties>
21+
<developers>
22+
<developer>
23+
<id>frsyuki</id>
24+
<name>Sadayuki Furuhashi</name>
25+
<email>frsyuki@users.sourceforge.jp</email>
26+
</developer>
27+
<developer>
28+
<id>muga</id>
29+
<name>Muga Nishizawa</name>
30+
<email>muga.nishizawa@gmail.com</email>
31+
</developer>
32+
<developer>
33+
<id>oza</id>
34+
<name>Tsuyoshi Ozawa</name>
35+
<url>https://github.com/oza</url>
36+
</developer>
37+
<developer>
38+
<id>komamitsu</id>
39+
<name>Mitsunori Komatsu</name>
40+
<email>komamitsu@gmail.com</email>
41+
</developer>
42+
<developer>
43+
<id>xerial</id>
44+
<name>Taro L. Saito</name>
45+
<email>leo@xerial.org</email>
46+
</developer>
47+
</developers>
48+
}

0 commit comments

Comments
 (0)