Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update publish info #2

Merged
merged 1 commit into from
Dec 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.idea
.bsp
project/project
project/target
target
release.sh
release.sh
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@

0.2.7
=======
* fork project and update publish info
* update sbt-pgp plugin

0.2.6
=======
* scala 2.13 support
Expand Down
2 changes: 2 additions & 0 deletions LICENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

Copyright (c) 2016 Findify AB

Copyright (c) 2023 Marko Asplund

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ Not supported features (these might be implemented later):
s3mock package is available for Scala 2.11/2.12/2.13 (on Java 8/11). To install using SBT, add these
statements to your `build.sbt`:

libraryDependencies += "io.findify" %% "s3mock" % "0.2.6" % "test",
libraryDependencies += "io.github.marko-asplund" %% "s3mock" % "0.2.6" % "test",

On maven, update your `pom.xml` in the following way:
```xml
// add this entry to <dependencies/>
<dependency>
<groupId>io.findify</groupId>
<groupId>io.github.marko-asplund</groupId>
<artifactId>s3mock_2.13</artifactId>
<version>0.2.6</version>
<scope>test</scope>
Expand Down Expand Up @@ -167,6 +167,8 @@ The MIT License (MIT)

Copyright (c) 2016 Findify AB

Copyright (c) 2023 Marko Asplund

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
Expand Down
33 changes: 1 addition & 32 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
name := "s3mock"

version := "0.2.6"

organization := "io.findify"
version := "0.2.7-SNAPSHOT"

scalaVersion in ThisBuild := "2.13.2"

crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.10","2.13.2")

val akkaVersion = "2.5.31"

licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT"))

homepage := Some(url("https://github.com/findify/s3mock"))

libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
"com.typesafe.akka" %% "akka-http" % "10.1.12",
Expand Down Expand Up @@ -43,29 +37,6 @@ libraryDependencies ++= {

parallelExecution in Test := false

publishMavenStyle := true

publishTo := {
val nexus = "https://oss.sonatype.org/"
if (isSnapshot.value)
Some("snapshots" at nexus + "content/repositories/snapshots")
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
}

pomExtra := (
<scm>
<url>git@github.com:findify/s3mock.git</url>
<connection>scm:git:git@github.com:findify/s3mock.git</connection>
</scm>
<developers>
<developer>
<id>romangrebennikov</id>
<name>Roman Grebennikov</name>
<url>http://www.dfdx.me</url>
</developer>
</developers>)

enablePlugins(DockerPlugin)
assemblyJarName in assembly := "s3mock.jar"
mainClass in assembly := Some("io.findify.s3mock.Main")
Expand All @@ -88,5 +59,3 @@ imageNames in docker := Seq(
ImageName(s"findify/s3mock:${version.value.replaceAll("\\+", "_")}"),
ImageName(s"findify/s3mock:latest")
)

publishTo := sonatypePublishToBundle.value
3 changes: 2 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ logLevel := Level.Warn
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.2")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0")

40 changes: 40 additions & 0 deletions publish.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
organization := "io.github.marko-asplund"
organizationName := "marko-asplund"
organizationHomepage := Some(url("https://github.com/marko-asplund/"))

ThisBuild / scmInfo := Some(
ScmInfo(
url("https://github.com/marko-asplund/s3mock"),
"scm:git:git@github.com:marko-asplund/s3mock.git"
)
)
ThisBuild / developers := List(
Developer(
id = "romangrebennikov",
name = "Roman Grebennikov",
email = "your@email",
url = url("http://www.dfdx.me")
),
Developer(
id = "marko-asplund",
name = "Marko Asplund",
email = "your@email",
url = url("https://github.com/marko-asplund")
)
)

ThisBuild / description := "Embedded S3 server for easy mocking"
ThisBuild / licenses := List(
"MIT" -> url("https://opensource.org/licenses/MIT")
)
ThisBuild / homepage := Some(url("https://github.com/marko-asplund/s3mock"))

// Remove all additional repository other than Maven Central from POM
ThisBuild / pomIncludeRepository := { _ => false }
ThisBuild / publishTo := {
// For accounts created after Feb 2021:
val nexus = "https://s01.oss.sonatype.org/"
if (isSnapshot.value) Some("snapshots" at nexus + "content/repositories/snapshots")
else Some("releases" at nexus + "service/local/staging/deploy/maven2")
}
ThisBuild / publishMavenStyle := true