Skip to content
Permalink
Browse files

Version bump to polyglot-scala 0.3.1, adapted to new version

  • Loading branch information...
lefou committed Jun 27, 2018
1 parent d4d67db commit 701cf59e5d5e1dea4eced02e1b63afb70dad1381
@@ -3,7 +3,7 @@
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-scala</artifactId>
<version>0.3.0</version>
<version>0.3.1</version>
</extension>
</extensions>

@@ -323,7 +323,7 @@ object BlendedModel {
)
}

val allDeps = distinctDependencies(pureDependencies.map(_.pure) ++ dependencies)
val allDeps = distinctDependencies(pureDependencies.map(_.intransitive) ++ dependencies)

Model(
gav = gav,
@@ -12,28 +12,6 @@ implicit class ScalaJsGroupId(groupId: String) {
}
}

/** Helper class, to improve writing dependency experience. */
implicit class RichDependency(d: Dependency) {
def copy(
gav: Gav = d.gav,
`type`: String = d.`type`,
classifier: Option[String] = d.classifier,
scope: Option[String] = d.scope,
systemPath: Option[String] = d.systemPath,
exclusions: scala.collection.immutable.Seq[GroupArtifactId] = d.exclusions,
optional: Boolean = d.optional
): Dependency =
new Dependency(gav, `type`, classifier, scope, systemPath, exclusions, optional)

def %(scope: String): Dependency = d.copy(scope = Option(scope).filter(!_.trim().isEmpty()))

def classifier(classifier: String): Dependency = copy(classifier = Option(classifier))

def pure: Dependency = copy(exclusions = Seq("*" % "*"))

def exclude(ga: GroupArtifactId): Dependency = copy(exclusions = d.exclusions ++ Seq(ga))
}

// Dependencies
object Deps {
val activationApi = "org.apache.servicemix.specs" % "org.apache.servicemix.specs.activation-api-1.1" % "2.2.0"
@@ -53,7 +53,7 @@ object Plugins {
val jetty = "org.mortbay.jetty" % "jetty-maven-plugin" % "8.1.16.v20140903"
val lifecycle = "org.eclipse.m2e" % "lifecycle-mapping" % "1.0.0"
val nexusStaging = "org.sonatype.plugins" % "nexus-staging-maven-plugin" % "1.6.8"
val polyglot = "io.takari.polyglot" % "polyglot-translate-plugin" % "0.3.0"
val polyglot = "io.takari.polyglot" % "polyglot-translate-plugin" % "0.3.1"
val trEclipse = "de.tototec" % "de.tobiasroeser.eclipse-maven-plugin" % "0.1.0"
val sbtCompiler = "com.google.code.sbt-compiler-maven-plugin" % "sbt-compiler-maven-plugin" % "1.0.0"
val scala = "net.alchim31.maven" % "scala-maven-plugin" % "3.3.2"
@@ -244,6 +244,6 @@ BlendedModel(
gav = Blended.launcherFeatures,
packaging = "jar",
description = "The prepackaged features for blended.",
dependencies = featureDependencies(features).map(_.pure),
dependencies = featureDependencies(features).map(_.intransitive),
plugins = featuresMavenPlugins(features)
)
@@ -16,7 +16,7 @@ BlendedModel(
Deps.bouncyCastleBcprov % "provided",
Deps.bouncyCastlePkix,
Blended.domino,
Dependency(Deps.domino).pure,
Dependency(Deps.domino).intransitive,
Blended.mgmtBase,
Deps.log4s,
logbackCore % "test",

0 comments on commit 701cf59

Please sign in to comment.
You can’t perform that action at this time.